bug 提交

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

@@ -531,7 +531,6 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         List<String> nodes = Arrays.stream(jsonObject.get("nodes").toString().split(",")).collect(Collectors.toList());
 
         List<String> strs = nodes.stream().filter(x -> x.equals(stepCode)).collect(Collectors.toList());
-        if (0 < strs.size()) {
         ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(contingencyPlanId);
         instance.setId(null);
         instance.setRecordType("REPLYMESSAGE");
@@ -539,6 +538,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         instance.setContent(instance.getCategory());
         ContingencyPlanInstance res = repository.save(instance);
         if (!ObjectUtils.isEmpty(res)) {
+            if (0 < strs.size()) {
                 PlanExecuteVo vo = new PlanExecuteVo();
                 vo.setConfirm(buttonState);
                 vo.setStepState(stepStateOnbutton);
@@ -696,7 +696,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
 
     }
 
-//    @Scheduled(cron = "*/2 * * * * ?")
+    //    @Scheduled(cron = "*/2 * * * * ?")
     public void runFireQueue() throws Exception {
 
         if (fireQueue.size() == 0)
@@ -755,3 +755,4 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
     }
 
 }
+

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

@@ -81,6 +81,6 @@ public class PlanStepServiceImpl implements IPlanStepService {
     @Override
     public void initPlanTask() {
         redisTemplate.delete("planTask");
-        redisTemplate.opsForValue().set("planTask", "");
+//        redisTemplate.opsForValue().set("planTask", "");
     }
 }

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

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