修改web端预案执行按钮bug

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

@@ -368,10 +368,10 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
                     if (code.endsWith("_NOT")) {
                         contingencyPlanInstance.setRunstate(false);
                         //  满足移动端确认按钮展示，确认后，多按钮json只保留最后一个按钮
-                        planVisual3dService.updateStatusById(contingencyPlanId, false);
+                        planVisual3dService.updateStatusByIdWeb(contingencyPlanInstance, false);
                     } else {
                         //  满足移动端确认按钮展示，确认后，多按钮json只保留最后一个按钮
-                        planVisual3dService.updateStatusById(contingencyPlanId, true);
+                        planVisual3dService.updateStatusByIdWeb(contingencyPlanInstance, true);
                     }
                 }
                 ContingencyPlanInstance instance = repository.save(contingencyPlanInstance);

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

@@ -619,24 +619,38 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         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);
+            ContingencyPlanInstance contingencyPlanInstance = deleteButton(instance);
+            return contingencyPlanInstanceMapper.updateStatusById(id, contingencyPlanInstance.getContent(), runStatus);
         } else {
             return contingencyPlanInstanceMapper.updateStatusById(id, null, runStatus);
         }
     }
 
+    @Override
+    public ContingencyPlanInstance updateStatusByIdWeb(ContingencyPlanInstance contingencyPlanInstance, Boolean runStatus) {
+        if (runStatus) {
+            deleteButton(contingencyPlanInstance);
+        }
+        return contingencyPlanInstance;
+    }
+
+    private ContingencyPlanInstance deleteButton(ContingencyPlanInstance contingencyPlanInstance){
+        // 按钮去除
+        String content = null;
+        ButtonJsonVO buttonJsonVO;
+        if (!ObjectUtils.isEmpty(contingencyPlanInstance.getContent())) {
+            buttonJsonVO = JSONObject.parseObject(contingencyPlanInstance.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);
+                contingencyPlanInstance.setContent(content);
+            }
+        }
+        return contingencyPlanInstance;
+    }
     private List<String> getUserIds(String buttonCode) {
         String planStepJson = "";
         try {

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

@@ -122,4 +122,12 @@ public interface IPlanVisual3dService {
      * @return
      */
     boolean updateStatusById(String id, Boolean runStatus);
+
+    /**
+     * 修改动作执行状态-web
+     * @param contingencyPlanInstance
+     * @param runStatus
+     * @return
+     */
+    ContingencyPlanInstance updateStatusByIdWeb(ContingencyPlanInstance contingencyPlanInstance, Boolean runStatus);
 }

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

@@ -103,7 +103,7 @@
       </if>
       AND cpd.is_delete = 0
     </where>
-    ORDER BY cpd.update_time ASC
+    ORDER BY cpd.update_time DESC
     LIMIT #{start}, #{size}
   </select>