修改祁连站bug

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

@@ -591,6 +591,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                                 action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
                             }
                             mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
+                            bool = Boolean.FALSE;
                         } else {
                             alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
                                     equipmentSpecificAlarmLogService, false, ""));
@@ -845,6 +846,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                                     action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
                                 }
                                 mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
+                                bool = Boolean.FALSE;
                             } else {
                                 alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
                                         equipmentSpecificAlarmLogService, false, ""));
@@ -1134,6 +1136,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                             action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
                         }
                         mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
+                        bool = Boolean.FALSE;
                     } else {
                         alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
                                 equipmentSpecificAlarmLogService, false, ""));
@@ -1499,6 +1502,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 model.setExtras(equipMap);
             }
             model.setRelationId(String.valueOf(equipmentSpecificAlarmLog.getId()));
+            List<String> receive = new ArrayList<>();
+            receive.add("system");
+            model.setRecivers(receive);
             Token token = remoteSecurityService.getServerToken();
             systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
             log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -33,7 +33,7 @@
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             -- CONCAT( sal.equipment_specific_name, ' ', sal.equipment_specific_index_name ) AS eventdesc,
-            CONCAT( '位于', a.`name`, '的', sal.equipment_specific_name, '(', sal.equipment_specific_code, ')在',  sal.create_date, '发生', sal.equipment_specific_index_name, '，请相关人员进行核实确认现场情况！') AS eventdesc,
+            CONCAT(IF(a.`name` IS NOT NULL, CONCAT('位于', a.`name`, '的'), ''), sal.equipment_specific_name, '在',  sal.create_date, '发生', sal.equipment_specific_index_name, '事件，请相关人员进行核实确认现场情况！') AS eventdesc,
             sal.equipment_specific_index_name AS eventaction,
             IF
             ( sal.confirm_date IS NULL, FALSE, TRUE ) AS isreport,
@@ -70,7 +70,7 @@
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             -- CONCAT( sal.equipment_specific_name, ' ', sal.equipment_specific_index_name ) AS eventdesc,
-            CONCAT(sal.equipment_specific_name, '(', sal.equipment_specific_code, ')在',  sal.create_date, '发生', sal.equipment_specific_index_name, '，请相关人员进行核实确认现场情况！') AS eventdesc,
+            CONCAT(sal.equipment_specific_name, '在',  sal.create_date, '发生', sal.equipment_specific_index_name, '事件，请相关人员进行核实确认现场情况！') AS eventdesc,
             sal.equipment_specific_index_name AS eventaction,
             IF
             ( sal.confirm_date IS NULL, FALSE, TRUE ) AS isreport ,