Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -222,6 +222,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${equip.message.create.topic}")
     private String riskTopicCreate;
 
+    @Value("${equip.center.risk.topic}")
+    private String riskTopicCenter;
+
     private static String canvasTopic;
     @Value("${equip.point.equipmentdata.topic}")
     public void setCanvasTopic(String canvasTopic){
@@ -1465,20 +1468,19 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
             TopicEntityVo topicEntityVo = new TopicEntityVo();
             topicEntityVo.setIotCode(equipmentSpeIndex.getIotCode());
-            topicEntityVo.setTopic("equip/risk/trigger");
+            topicEntityVo.setTopic(riskTopicCenter);
             detailVo.setEquipInfo(equipInfoVo);
             detailVo.setAlarmInfo(alarmInfoVo);
             topicEntityVo.setData(JSON.toJSONString(detailVo));
             mqttSendGateway.sendToMqtt(riskTopicCreate, JSON.toJSONString(topicEntityVo));
+            log.info(String.format("站端发送给中心级触发风险：%s", JSON.toJSONString(topicEntityVo)));
         });
     }
 
     @Override
     public void handleDataToRiskModel(String topic, String message) {
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(message));
-        TopicEntityVo entityVo = JSONObject.toJavaObject(jsonObject, TopicEntityVo.class);
-        JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(entityVo.getMessage()));
-        SendToMsgRiskDetailVo detailVo = JSONObject.toJavaObject(object, SendToMsgRiskDetailVo.class);
+        JSONObject jsonObject = JSONObject.parseObject(message);
+        SendToMsgRiskDetailVo detailVo = JSONObject.toJavaObject(jsonObject, SendToMsgRiskDetailVo.class);
         RiskDataVo dataVo = new RiskDataVo();
         dataVo.setIndexKey(detailVo.getAlarmInfo().getKey());
         dataVo.setIndexValue(detailVo.getAlarmInfo().getValue());
@@ -1503,12 +1505,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         detailsVos.add(dynamicDetailsVo);
         infoVo.setDynamicDetails(detailsVos);
         dataVo.setBizInfo(infoVo);
-
-        TopicEntityVo topicEntityVo = new TopicEntityVo();
-        topicEntityVo.setIotCode(entityVo.getIotCode());
-        topicEntityVo.setTopic(riskTopic);
-        topicEntityVo.setMessage(JSON.toJSONString(dataVo));
-        mqttSendGateway.sendToMqtt(riskTopic, JSON.toJSONString(topicEntityVo));
+        mqttSendGateway.sendToMqtt(riskTopic, JSON.toJSONString(dataVo));
     }
 
     /**