item：应急处置执行推送优化

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

@@ -425,7 +425,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         map.put("confirm", buttonState);
         map.put("contingencyPlanId", contingencyPlanId);
         map.put("stepState", stepStateOnbutton);
-        if (StringUtils.isNotBlank(token) || StringUtils.isNotBlank(product)) {
+        if (StringUtils.isBlank(token) || StringUtils.isBlank(product)) {
             Toke serverToken = remoteSecurityService.getServerToken();
             map.put("token", serverToken.getToke());
             map.put("product", serverToken.getProduct());
@@ -441,10 +441,13 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
 
     @Override
     public ContingencyPlanInstance updateExtendColumn(ContingencyPlanInstance contingencyPlanInstance) {
-        Toke toke = remoteSecurityService.getServerToken();
-        RequestContext.setToken(toke.getToke());
-        RequestContext.setProduct(toke.product);
-        RequestContext.setAppKey(toke.appKey);
+        String token = RequestContext.getToken();
+        if (StringUtils.isBlank(token)) {
+            Toke toke = remoteSecurityService.getServerToken();
+            RequestContext.setToken(toke.getToke());
+            RequestContext.setProduct(toke.product);
+            RequestContext.setAppKey(toke.appKey);
+        }
         FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.getme();
         AgencyUserModel user = (AgencyUserModel) feignClientResult.getResult();
 

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -84,7 +84,7 @@ rocketmq.producer.groupName2=groupName2
 rocketmq.producer.namesrvAddr2=172.16.3.135:9876
 
 rocket-plan-topic =topic_fire_emergency_plan
-rocket-equip-alarm-topic =topic_fire_equip_alarm 
+rocket-equip-alarm-topic =topic_fire_equip_alarm
 
 #规则ip配置，用于多网卡及docker镜像启动时添加
 #rule.definition.local-ip=172.16.11.201

YeeAmosFireAutoSysStart/src/main/resources/json/plan-step.json

@@ -69,7 +69,7 @@
     "stepStatus": "0",
     "buttonCode": "HANDOVER_COMMAND",
     "isParallel": "1",
-    "roleCode": "Digital_Responsing_Plan_B"
+    "roleCode": "Digital_Responsing_Plan_A"
   },
   {
     "stepCode": "9",
@@ -85,7 +85,7 @@
     "stepStatus": "0",
     "buttonCode": "START_VALVE_HALL_CONTINGENCY",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B"
+    "roleCode": "Digital_Responsing_Plan_A"
   },
   {
     "stepCode": "11",
@@ -93,7 +93,7 @@
     "stepStatus": "0",
     "buttonCode": "PLUG_CABLETRENCH",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B"
+    "roleCode": "Digital_Responsing_Plan_A"
   },
   {
     "stepCode": "12",
@@ -101,7 +101,7 @@
     "stepStatus": "0",
     "buttonCode": "HANDOVER_FIGTHHING",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B"
+    "roleCode": "Digital_Responsing_Plan_A"
   },
   {
     "stepCode": "13",
@@ -109,7 +109,7 @@
     "stepStatus": "0",
     "buttonCode": "FIRE_EXTINCT",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B"
+    "roleCode": "Digital_Responsing_Plan_A"
   },
   {
     "stepCode": "14",
@@ -117,6 +117,6 @@
     "stepStatus": "0",
     "buttonCode": "END_EMERGENCY",
     "isParallel": "1",
-    "roleCode": "Digital_Responsing_Plan_C"
+    "roleCode": "Digital_Responsing_Plan_A"
   }
 ]
\ No newline at end of file