修改bug

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.fas.business.action;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.component.rule.MethodParam;
 import com.yeejoin.amos.component.rule.RuleActionBean;
 import com.yeejoin.amos.component.rule.RuleMethod;
@@ -24,7 +23,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IPlanOperationRecordDao;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.*;
-import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.vo.ButtonJsonVO;
@@ -100,9 +98,6 @@ public class ContingencyAction implements CustomerAction {
     private ContingencyLogPublisher contingencyLogPublisher;
 
     @Autowired
-    private IRiskSourceService riskSourceService;
-
-    @Autowired
     private IEquipmentService equipmentService;
 
     @Autowired

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

@@ -175,7 +175,7 @@ public class ContingencyPlanController extends BaseController {
         vo.setUserName(user.getRealName());
         ContingencyPlanResponseVo result= null;
         try {
-             result = contingencyPlanService.planStart(vo,toke);
+             result = contingencyPlanService.planStart(vo, toke);
         }catch (Exception e){
             e.printStackTrace();
             return CommonResponseUtil2.failure();

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

@@ -56,6 +56,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.typroject.tyboot.core.foundation.context.RequestContext.*;
+
 @Service
 public class ContingencyInstanceImpl implements IContingencyInstance {
 
@@ -518,6 +520,13 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         } catch (IOException e) {
             throw new RuntimeException("获取预案节点信息失败！");
         }
+
+        if ("0".equals(stepCode)) {
+            contingencyInstance.fire(batchNo, stepCode, buttonJson, contingencyPlanId,
+                    "FIRE_CONFIRM", buttonState, stepStateOnbutton, "true", "true", token,
+                    product, appKey, startUserName);
+        }
+
         JSONObject jsonObject = JSONObject.parseObject(json);
         List<String> nodes = Arrays.stream(jsonObject.get("nodes").toString().split(",")).collect(Collectors.toList());
 

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

@@ -722,6 +722,8 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
             bool = contingencyPlanInstanceMapper.updateTaskStatusById(id, null, runStatus, userName, userId, img, PlanReplyMessageEnum.TEXT.getCode(), roleNames);
         }
 
+
+
         if (bool) {
             if (redisTemplate.hasKey("planTask")) {
                 redisTemplate.delete("planTask");

YeeAmosFireAutoSysStart/src/main/resources/json/plan-setp-node.json

 {
-  "nodes": "0,2,5,15,19"
+  "nodes": "0,1,2,5,9,10,11",
+  "nodes_pyh": "0,2,5,15,19"
 }