修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/TopicEntityVo.java

@@ -21,6 +21,8 @@ public class TopicEntityVo {
 
     private String message;
 
+    private String data;
+
     private String type;
 
     // 若是车辆返回车牌号

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

@@ -1465,8 +1465,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
             TopicEntityVo topicEntityVo = new TopicEntityVo();
             topicEntityVo.setIotCode(equipmentSpeIndex.getIotCode());
-            topicEntityVo.setTopic(riskTopicCreate);
-            topicEntityVo.setMessage(JSON.toJSONString(detailVo));
+            topicEntityVo.setTopic("equip/risk/trigger");
+            detailVo.setEquipInfo(equipInfoVo);
+            detailVo.setAlarmInfo(alarmInfoVo);
+          //  topicEntityVo.setMessage(JSON.toJSONString(detailVo));
+            topicEntityVo.setData(JSON.toJSONString(detailVo));
             mqttSendGateway.sendToMqtt(riskTopicCreate, JSON.toJSONString(topicEntityVo));
         });
     }

amos-boot-utils/amos-boot-utils-message/src/main/resources/json/topic.json

@@ -28,5 +28,10 @@
     "code": "xf",
     "emqTopic": "emq.xf.created",
     "akkaTopic": "JKXT2BP-XF-Topic"
+  },
+  {
+    "code": "risk",
+    "emqTopic": "emq.risk.created",
+    "akkaTopic": "JKXT2BP-RISK-Topic"
   }
 ]
\ No newline at end of file