更新代码

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/EquipmentRiskTypeEnum.java

@@ -10,7 +10,7 @@ package com.yeejoin.amos.fas.common.enums;
  */
 public enum EquipmentRiskTypeEnum {
 
-    HZGJ("alarm", "火灾告警"),GZ("trouble", "故障");
+    HZGJ("FIREALARM", "火灾告警"),GZ("BREAKDOWN", "故障");
 
     private String code;
     private String type;

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

@@ -135,13 +135,13 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setMonitor(equipment != null ? equipment.getName() : "");
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
-        if (EquipmentRiskTypeEnum.HZGJ.getType().equals(equipmentSpecificIndex.getType())) { //设备告警处理逻辑
+        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(equipmentSpecificIndex.getType())) { //设备告警处理逻辑
             log.info("(报警)Message type is: " + equipmentSpecificIndex.getType());
 
             // 报警触发调用规则服务
             executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
 
-        } else if (EquipmentRiskTypeEnum.GZ.getType().equals(equipmentSpecificIndex.getType())) { // 设备故障处理逻辑
+        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(equipmentSpecificIndex.getType())) { // 设备故障处理逻辑
             log.info("(故障)Message type is: " + equipmentSpecificIndex.getType());
             long equipId = 0;
             if(StringUtil.isNotEmpty(equipment)) {