Merge branch 'dev_upgrade-1225' of 172.16.10.76:station/YeeAmosFireAutoSysRoot…

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

@@ -157,8 +157,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
         //设备告警处理逻辑
-        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(equipmentSpecificIndex.getType())) {
-            log.info("(报警)Message type is: " + equipmentSpecificIndex.getType());
+        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)) {
+            log.info("(报警)Message type is: " + specificIndexType);
             /**
              * 推送告警数据
              * 影响区域：消防安全=>火灾告警
@@ -168,9 +168,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             // 报警触发调用规则服务
             //注释自动触发预案
             //executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke,topicEntity.getRecordId());
-        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(equipmentSpecificIndex.getType())) {
+        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(specificIndexType)) {
             // 设备故障处理逻辑
-            log.info("(故障)Message type is: " + equipmentSpecificIndex.getType());
+            log.info("(故障)Message type is: " +specificIndexType);
             final String stateTrue = "true";
             final String stateFalse = "false";
             String state = equipmentSpecificIndex.getValue();
@@ -200,7 +200,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
            
         } else {
             // 监测数据逻辑
-            log.info("(监测)Message type is: " + equipmentSpecificIndex.getType());
+            log.info("(监测)Message type is: " + specificIndexType);
             Map<String, Object> content = new HashMap<>();
             content.put("id", equipmentSpecific.getId());
             content.put("label", equipmentSpecific.getName()+" "+equipmentSpecificIndex.getEquipmentIndexName());