item：修改动作执行状态

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -257,7 +257,7 @@ public class PlanVisual3dController extends BaseController {
     @Permission
     @ApiOperation(value = "修改动作执行状态", notes = "修改动作执行状态")
     @PostMapping(value = "/updateStatusById")
-    public ResponseModel updateStatusById(@RequestParam("id") String id) {
-        return CommonResponseUtil.successNew(planVisual3dService.updateStatusById(id));
+    public ResponseModel updateStatusById(@RequestParam("id") String id, @RequestParam("runStatuss") Boolean runStatus) {
+        return CommonResponseUtil.successNew(planVisual3dService.updateStatusById(id, runStatus));
     }
 }

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,10 +20,12 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla
 
     /**
      * 修改动作执行状态
+     *
      * @param id
+     * @param runStatus
      * @return
      */
-    Boolean updateStatusById(@Param("id") String id, @Param("content") String content);
+    Boolean updateStatusById(@Param("id") String id, @Param("content") String content, Boolean runStatus);
 
     ContingencyPlanInstance  getMessageById(@Param("id") String id);
 

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

@@ -373,10 +373,12 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
                     String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
                     webMqttComponent.publish(topic, "{\"msgType\":\"replayMessage\"}");
                     //  满足移动端确认按钮展示，确认后，多按钮json只保留最后一个按钮
-                    planVisual3dService.updateStatusById(contingencyPlanId);
+                    planVisual3dService.updateStatusById(contingencyPlanId, true);
                 }
                 if (buttonState.equals("CONFIRM_NOT")) {
                     contingencyPlanInstance.setRunstate(false);
+                    //  满足移动端确认按钮展示，确认后，多按钮json只保留最后一个按钮
+                    planVisual3dService.updateStatusById(contingencyPlanId, false);
                 }
                 ContingencyPlanInstance instance = repository.save(contingencyPlanInstance);
                 //  异步数据同步之消息发送

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

@@ -602,22 +602,26 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     }
 
     @Override
-    public boolean updateStatusById(String 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);
+    public boolean updateStatusById(String id, Boolean runStatus) {
+        if (runStatus) {
+            // 按钮去除
+            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, runStatus);
+        } else {
+            return contingencyPlanInstanceMapper.updateStatusById(id, null, runStatus);
         }
-        return contingencyPlanInstanceMapper.updateStatusById(id, content);
     }
 
     private List<String> getUserIds(String buttonCode) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IPlanVisual3dService.java

@@ -121,5 +121,5 @@ public interface IPlanVisual3dService {
      * @param id
      * @return
      */
-    boolean updateStatusById(String id);
+    boolean updateStatusById(String id, Boolean runStatus);
 }

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

@@ -6,7 +6,7 @@
         UPDATE
              contingency_plan_instance
              SET
-              runstate = 1
+              runstate = ${runStatus}
               <if test="content != null and content != ''">
                   , content = #{content}
               </if>