预警触发主题前缀业务字段修改

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

@@ -34,6 +34,8 @@ public class RiskBizInfoVo {
 
     private CustomizeItems customizeItems;
 
+    private String type;
+
     private Object extra;
 
 

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

@@ -1384,7 +1384,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 String.valueOf(equipmentSpecificIndex.getEquipmentSpecificId()),
                 "fireIot/data/analysis",
                 indexKey,
-                extra);
+                extra,
+                "cafsWaterLevelOver");
 
         if (nowValue.compareTo(minValue) < 0 || nowValue.compareTo(maxValue) > 0) {
             String body = "";
@@ -1477,7 +1478,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         map.get("id").toString(),
                         "fireIot/data/analysis",
                         "WATER_POOL_LEVEL",
-                        extra);
+                        extra,
+                        "waterLevelOver");
             }
 
             if (nowValue.compareTo(minValue) < 0 || nowValue.compareTo(maxValue) > 0) {
@@ -1525,7 +1527,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                                String businessId,
                                String topic,
                                String indexKey,
-                               Object extra) {
+                               Object extra,
+                               String source) {
         if (minValue.compareTo(new BigDecimal(0)) > 0
                 && maxValue.compareTo(new BigDecimal(0)) > 0) {
             BigDecimal divide = new BigDecimal(0);
@@ -1538,7 +1541,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(indexKey);
             bizMessage.setIndexValue(String.valueOf(divide));
-            RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra);
+            RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source);
             bizMessage.setBizInfo(riskBizInfoVo);
             bizMessage.setTraceId(businessId);
             try {
@@ -1550,9 +1553,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
-    public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, Object extra) {
+    public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, Object extra, String source) {
         RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
-        riskBizInfoVo.setWarningObjectName("当前值低于或高于报警阈值≥10%");
+        riskBizInfoVo.setWarningObjectName(equipmentSpecificIndex.getEquipmentSpecificName());
         riskBizInfoVo.setWarningObjectCode(equipmentSpecificIndex.getEquipmentSpecificCode());
         riskBizInfoVo.setSourceAttribution(equipmentSpecificIndex.getBizOrgCode());
         riskBizInfoVo.setSourceAttributionDesc(equipmentSpecificIndex.getBizOrgName());
@@ -1565,6 +1568,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         customizeItems.setWarningContent("当前值低于或高于报警阈值≥10%");
         riskBizInfoVo.setCustomizeItems(customizeItems);
         riskBizInfoVo.setExtra(extra);
+        riskBizInfoVo.setType(source);
         return riskBizInfoVo;
     }