优化保养计划添加功能

java110-db/src/main/resources/mapper/community/MaintainancePlanStaffV1ServiceDaoImplMapper.xml

@@ -5,96 +5,93 @@
 <mapper namespace="maintainancePlanStaffV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存保养计划员工信息 add by wuxw 2018-07-03 -->
     <insert id="saveMaintainancePlanStaffInfo" parameterType="Map">
         insert into maintainance_plan_staff(
-staff_name,plan_id,community_id,staff_id,mps_id
-) values (
-#{staffName},#{planId},#{communityId},#{staffId},#{mpsId}
-)
+        staff_name,plan_id,community_id,staff_id,mps_id
+        ) values (
+        #{staffName},#{planId},#{communityId},#{staffId},#{mpsId}
+        )
     </insert>
 
 
-
     <!-- 查询保养计划员工信息 add by wuxw 2018-07-03 -->
     <select id="getMaintainancePlanStaffInfo" parameterType="Map" resultType="Map">
-        select  t.staff_name,t.staff_name staffName,t.plan_id,t.plan_id planId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId,t.mps_id,t.mps_id mpsId 
-from maintainance_plan_staff t 
-where 1 =1 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="planId !=null and planId != ''">
-   and t.plan_id= #{planId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="mpsId !=null and mpsId != ''">
-   and t.mps_id= #{mpsId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.staff_name,t.staff_name staffName,t.plan_id,t.plan_id planId,t.community_id,t.community_id
+        communityId,t.staff_id,t.staff_id staffId,t.mps_id,t.mps_id mpsId
+        from maintainance_plan_staff t
+        where 1 =1
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="planId !=null and planId != ''">
+            and t.plan_id= #{planId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="mpsId !=null and mpsId != ''">
+            and t.mps_id= #{mpsId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改保养计划员工信息 add by wuxw 2018-07-03 -->
     <update id="updateMaintainancePlanStaffInfo" parameterType="Map">
-        update  maintainance_plan_staff t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-, t.staff_name= #{staffName}
-</if> 
-<if test="planId !=null and planId != ''">
-, t.plan_id= #{planId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
- where 1=1 <if test="mpsId !=null and mpsId != ''">
-and t.mps_id= #{mpsId}
-</if> 
+        update maintainance_plan_staff t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
+
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        where 1=1
+        <if test="mpsId !=null and mpsId != ''">
+            and t.mps_id= #{mpsId}
+        </if>
+        <if test="planId !=null and planId != ''">
+            and t.plan_id= #{planId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 查询保养计划员工数量 add by wuxw 2018-07-03 -->
-     <select id="queryMaintainancePlanStaffsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from maintainance_plan_staff t 
-where 1 =1 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="planId !=null and planId != ''">
-   and t.plan_id= #{planId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="mpsId !=null and mpsId != ''">
-   and t.mps_id= #{mpsId}
-</if> 
+    <select id="queryMaintainancePlanStaffsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from maintainance_plan_staff t
+        where 1 =1
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="planId !=null and planId != ''">
+            and t.plan_id= #{planId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="mpsId !=null and mpsId != ''">
+            and t.mps_id= #{mpsId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.community.cmd.maintainancePlan;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,8 +23,14 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.equipmentAccount.EquipmentAccountDto;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanMachineV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IMaintainancePlanV1InnerServiceSMO;
 import com.java110.po.maintainancePlan.MaintainancePlanPo;
+import com.java110.po.maintainancePlanMachine.MaintainancePlanMachinePo;
+import com.java110.po.maintainancePlanStaff.MaintainancePlanStaffPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -32,6 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：保存
  * 服务编码：maintainancePlan.saveMaintainancePlan
@@ -52,6 +61,15 @@ public class SaveMaintainancePlanCmd extends Cmd {
     @Autowired
     private IMaintainancePlanV1InnerServiceSMO maintainancePlanV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMaintainancePlanMachineV1InnerServiceSMO maintainancePlanMachineV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IMaintainancePlanStaffV1InnerServiceSMO maintainancePlanStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "planName", "请求报文中未包含planName");
@@ -60,9 +78,27 @@ public class SaveMaintainancePlanCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "startDate", "请求报文中未包含startDate");
         Assert.hasKeyAndValue(reqJson, "endDate", "请求报文中未包含endDate");
         Assert.hasKeyAndValue(reqJson, "planPeriod", "请求报文中未包含planPeriod");
-        Assert.hasKeyAndValue(reqJson, "maintainanceMonth", "请求报文中未包含maintainanceMonth");
-        Assert.hasKeyAndValue(reqJson, "maintainanceDay", "请求报文中未包含maintainanceDay");
-        Assert.hasKeyAndValue(reqJson, "maintainanceEveryday", "请求报文中未包含maintainanceEveryday");
+
+        if (!reqJson.containsKey("staffs")) {
+            throw new CmdException("未包含员工");
+        }
+
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+
+        if (staffs.size() < 1) {
+            throw new CmdException("未包含员工");
+        }
+
+        if (!reqJson.containsKey("machineIds")) {
+            throw new CmdException("未包含设备");
+        }
+
+        JSONArray machineIds = reqJson.getJSONArray("machineIds");
+
+        if (machineIds.size() < 1) {
+            throw new CmdException("未包含设备");
+        }
+
 
     }
 
@@ -78,6 +114,39 @@ public class SaveMaintainancePlanCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+        MaintainancePlanStaffPo maintainancePlanStaffPo = null;
+        for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
+            maintainancePlanStaffPo = new MaintainancePlanStaffPo();
+            maintainancePlanStaffPo.setCommunityId(reqJson.getString("communityId"));
+            maintainancePlanStaffPo.setPlanId(maintainancePlanPo.getPlanId());
+            maintainancePlanStaffPo.setMpsId(GenerateCodeFactory.getGeneratorId("11"));
+            maintainancePlanStaffPo.setStaffId(staffs.getJSONObject(staffIndex).getString("userId"));
+            maintainancePlanStaffPo.setStaffName(staffs.getJSONObject(staffIndex).getString("name"));
+            maintainancePlanStaffV1InnerServiceSMOImpl.saveMaintainancePlanStaff(maintainancePlanStaffPo);
+        }
+
+        JSONArray machineIds = reqJson.getJSONArray("machineIds");
+        MaintainancePlanMachinePo maintainancePlanMachinePo = null;
+        EquipmentAccountDto equipmentAccountDto = null;
+        List<EquipmentAccountDto> accountDtos = null;
+        for (int machineIndex = 0; machineIndex < machineIds.size(); machineIndex++) {
+            maintainancePlanMachinePo = new MaintainancePlanMachinePo();
+            maintainancePlanMachinePo.setCommunityId(reqJson.getString("communityId"));
+            maintainancePlanMachinePo.setPlanId(maintainancePlanPo.getPlanId());
+            maintainancePlanMachinePo.setMpmId(GenerateCodeFactory.getGeneratorId("11"));
+            maintainancePlanMachinePo.setMachineId(machineIds.getString(machineIndex));
+
+            equipmentAccountDto = new EquipmentAccountDto();
+            equipmentAccountDto.setMachineId(machineIds.getString(machineIndex));
+            accountDtos = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccounts(equipmentAccountDto);
+            Assert.listOnlyOne(accountDtos, "设备不存在");
+
+            maintainancePlanMachinePo.setMachineName(accountDtos.get(0).getMachineName());
+            maintainancePlanMachineV1InnerServiceSMOImpl.saveMaintainancePlanMachine(maintainancePlanMachinePo);
+        }
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/maintainancePlan/UpdateMaintainancePlanCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.community.cmd.maintainancePlan;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,8 +23,10 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IMaintainancePlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IMaintainancePlanV1InnerServiceSMO;
 import com.java110.po.maintainancePlan.MaintainancePlanPo;
+import com.java110.po.maintainancePlanStaff.MaintainancePlanStaffPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -52,11 +55,26 @@ public class UpdateMaintainancePlanCmd extends Cmd {
     @Autowired
     private IMaintainancePlanV1InnerServiceSMO maintainancePlanV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IMaintainancePlanStaffV1InnerServiceSMO maintainancePlanStaffV1InnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "planId", "planId不能为空");
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
+        if (!reqJson.containsKey("staffs")) {
+            throw new CmdException("未包含员工");
+        }
+
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+
+        if (staffs.size() < 1) {
+            throw new CmdException("未包含员工");
+        }
+
     }
 
     @Override
@@ -68,6 +86,27 @@ public class UpdateMaintainancePlanCmd extends Cmd {
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");
+
+        }
+
+        MaintainancePlanStaffPo maintainancePlanStaffPo = null;
+        maintainancePlanStaffPo = new MaintainancePlanStaffPo();
+        maintainancePlanStaffPo.setPlanId(maintainancePlanPo.getPlanId());
+        flag = maintainancePlanStaffV1InnerServiceSMOImpl.deleteMaintainancePlanStaff(maintainancePlanStaffPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+
+        }
+        JSONArray staffs = reqJson.getJSONArray("staffs");
+        for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
+            maintainancePlanStaffPo = new MaintainancePlanStaffPo();
+            maintainancePlanStaffPo.setCommunityId(reqJson.getString("communityId"));
+            maintainancePlanStaffPo.setPlanId(maintainancePlanPo.getPlanId());
+            maintainancePlanStaffPo.setMpsId(GenerateCodeFactory.getGeneratorId("11"));
+            maintainancePlanStaffPo.setStaffId(staffs.getJSONObject(staffIndex).getString("userId"));
+            maintainancePlanStaffPo.setStaffName(staffs.getJSONObject(staffIndex).getString("name"));
+            maintainancePlanStaffV1InnerServiceSMOImpl.saveMaintainancePlanStaff(maintainancePlanStaffPo);
         }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());