修改消息推送

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

@@ -162,7 +162,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setMonitor(equipment != null ? equipment.getName() : "");
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
-        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)) { //设备告警处理逻辑
+        if (nameKey.equals("fireAlarm")) { //设备告警处理逻辑
             log.info("(报警)Message type is: " + specificIndexType);
 
             //通知刷新3d页面告警数据
@@ -175,10 +175,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             webMqttComponent.publish(title, JSON.toJSONString(view3dService.getSafetyExecuteListTop5("fire", equipmentSpecific.getOrgCode())));
 
             // 报警触发调用规则服务
-            if(!ObjectUtils.isEmpty(equipment) && !ObjectUtils.isEmpty(equipment.getReservePlan())){
-                executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
+            if(EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)&&!ObjectUtils.isEmpty(equipment) && !ObjectUtils.isEmpty(equipment.getReservePlan())){
+            	executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
             }
-        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(specificIndexType)) { // 设备故障处理逻辑
+        } else if (nameKey.equals("fault")) { // 设备故障处理逻辑
             log.info("(故障)Message type is: " + specificIndexType);
             long equipId = 0;
             if(StringUtil.isNotEmpty(equipment)) {
@@ -228,8 +228,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
     	String key = equipmentSpecificIndex.getIotCode()+"-"+equipmentSpecificIndex.getNameKey();
     	if(redisTemplate.hasKey(key)){
     		EquipmentSpecificIndexVo equipmentSpecificIndexVo = JSON.parseObject(redisTemplate.opsForValue().get(key).toString(), EquipmentSpecificIndexVo.class);
-    		if(equipmentSpecificIndex.getEquipmentSpecificId().toString().equals(equipmentSpecificIndexVo.getEquipmentSpecificId().toString()) 
-    				&& equipmentSpecificIndex.getValue().equals(equipmentSpecificIndexVo.getValue())){
+    		if(equipmentSpecificIndex.getValue().equals(equipmentSpecificIndexVo.getValue())){
     			return false;
     		}
     	}

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-AUTOSYS-my
+spring.application.name = AMOS-AUTOSYS
 server.servlet.context-path=/fireAutoSys
 server.port = 8083
 spring.profiles.active=dev