修改接口

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -499,8 +499,7 @@ public class ContingencyAction implements CustomerAction {
             ContingencyPlanInstance instance = contingencyInstance.getMessageById(contingencyPlanId);
             if (instance != null) {
                 ContingencyPlanInstance planInstance = contingencyInstance.updateExtendColumn(instance);
-//                TODO,手写更新方法
-//                contingencyPlanInstanceMapper.updateById(planInstance);
+                contingencyPlanInstanceMapper.updateMessageById(planInstance);
             }
             //极光推送
             iPlanVisual3dService.sendMessage(batchNo, buttonCode, null);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyPlanInstanceMapper.java

@@ -23,7 +23,14 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla
      * @param id
      * @return
      */
-    Boolean updateStatusById(@Param("id") String id);
+    Boolean updateStatusById(@Param("id") String id, @Param("content") String content);
 
     ContingencyPlanInstance  getMessageById(@Param("id") String id);
+
+    /**
+     * 信息更新
+     * @param contingencyPlanInstance
+     * @return
+     */
+    Boolean updateMessageById(@Param("dto") ContingencyPlanInstance contingencyPlanInstance);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -220,11 +220,11 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             instanceInfo.setId(batchNo);
             instanceInfo.setName(detail.getPlanName());
             instanceInfo.setOrgCode(detail.getOrgCode());
-//            TODO,手写查询方法
-//            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(equipmentSpecific.getWarehouseStructureId());
-//            if (warehouseStructure != null) {
-//                instanceInfo.setPosition(warehouseStructure.getName());
-//            }
+
+            WarehouseStructure warehouseStructure = warehouseStructureMapper.getMessageById(equipmentSpecific.getWarehouseStructureId());
+            if (warehouseStructure != null) {
+                instanceInfo.setPosition(warehouseStructure.getName());
+            }
             contingencyInstanceInfoService.addDisposalDetails(instanceInfo);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -16,11 +16,13 @@ import com.yeejoin.amos.fas.business.feign.PushFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.jpush.JPushTypeEnum;
 import com.yeejoin.amos.fas.business.jpush.PushMsgParam;
+import com.yeejoin.amos.fas.business.service.intfc.IContingencyPlanService;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.business.vo.ButtonJsonVO;
 import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
@@ -614,7 +616,21 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
 
     @Override
     public boolean updateStatusById(String id) {
-        return contingencyPlanInstanceMapper.updateStatusById(id);
+        // 按钮去除
+        ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(id);
+        String content = null;
+        ButtonJsonVO buttonJsonVO;
+        if (!ObjectUtils.isEmpty(instance.getContent())){
+             buttonJsonVO = JSONObject.parseObject(instance.getContent(), ButtonJsonVO.class);
+            if (!ObjectUtils.isEmpty(buttonJsonVO.getOperate()) && buttonJsonVO.getOperate().size() > 1){
+                ArrayList<Map<String, Object>> maps = new ArrayList<>();
+                // 取最后一个按钮
+                maps.add(buttonJsonVO.getOperate().get(buttonJsonVO.getOperate().size() - 1));
+                buttonJsonVO.setOperate(maps);
+                content = JSONObject.toJSONString(buttonJsonVO);
+            }
+        }
+        return contingencyPlanInstanceMapper.updateStatusById(id, content);
     }
 
     private List<String> getUserIds(String buttonCode) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ButtonJsonVO.java

+package com.yeejoin.amos.fas.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Data
+public class ButtonJsonVO {
+    String type;
+    String stepCode;
+    List<Map<String, Object>> operate;
+
+}

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyPlanInstanceMapper.xml

@@ -7,8 +7,42 @@
              contingency_plan_instance
              SET
               runstate = 1
+              <if test="content != null and content != ''">
+                  , content = #{content}
+              </if>
              where id = #{id}
     </update>
+    <update id="updateMessageById">
+        UPDATE `contingency_plan_instance`
+        SET
+        <if test="dto.recordType != null and dto.recordType != ''">
+            `record_type` = #{dto.recordType},
+        </if>
+        <if test="dto.content != null and dto.content != ''">
+            `content` =  #{dto.content},
+        </if>
+        `category` = #{dto.category},
+        `icon` = #{dto.icon},
+        `sort` = #{dto.sort},
+        `sequence_num` =  #{dto.sequenceNum},
+        <if test="dto.batchNo != null and dto.batchNo != ''">
+            `batch_no` =  #{dto.batchNo},
+        </if>
+        `update_date` = NOW(),
+        `update_user` = #{dto.updateUser},
+        `tips` = #{dto.tips},
+        `runstate` = #{dto.runstate},
+        `file_path` =  #{dto.filePath},
+        `file_type` = #{dto.fileType},
+        `role_name` = #{dto.roleName},
+        `role_code` = #{dto.roleCode},
+        `start_user_name` = #{dto.startUserName},
+        `start_user_id` = #{dto.startUserId},
+        `person_img` = #{dto.personImg}
+        WHERE
+            `id` = #{dto.id};
+
+    </update>
 
     <select id="getPlanInstanceListByPage" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance">
     select * from

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/WarehouseStructureMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.WarehouseStructureMapper">
+
+    <select id="getMessageById" resultType="com.yeejoin.amos.fas.dao.entity.WarehouseStructure">
+     select * from wl_warehouse_structure where  id = #{id}
+
+    </select>
+</mapper>
\ No newline at end of file