消息同步问题修改

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

@@ -686,9 +686,6 @@ public class ContingencyAction implements CustomerAction {
         tempmap1.put("status", PlanRecordStatusEnum.COMPLETE.getCode());
         result.add(tempmap1);
 
-        this.sendcmd("message", paramObj, result);
-        redisTemplate.delete("contingencyRo");
-
         //  结束预案，更新设备重点设备参数
         if (contingencyRo != null) {
             Equipment equipment = equipmentService.queryOne(Long.parseLong(contingencyRo.getEquipmentId()));
@@ -722,6 +719,9 @@ public class ContingencyAction implements CustomerAction {
 
         // 结束预案，更新预案信息表结束时间
         contingencyInstanceInfoService.updateEndTimeById(batchNo);
+
+        this.sendcmd("message", paramObj, result);
+        redisTemplate.delete("contingencyRo");
     }
 
     private void planDetailDataSync(PlanDetail detail) {

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

@@ -287,6 +287,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
                 // 更新记录之后发送消息刷新
                 String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
                 System.out.println("=========================> 刷新聊天记录 refreshRecord ");
+
                 webMqttComponent.publish(topic, "{\"msgType\":\"refreshRecord\"}");
             }
         } else {
@@ -397,7 +398,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
                     contingencyInstanceInfoService.updateEndTimeById(batchNo);
                     String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
                     System.out.println("=========================> 规则触发  预案动作结束 ");
-                    webMqttComponent.publish(topic, "{\"msgType\":\"stopOperate\"}");
+
                 }
             }
         }