消息提醒相关信息修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java

@@ -225,4 +225,7 @@ public class EquipmentSpecificAlarm extends BaseEntity {
     @TableField(value = "station_name")
     private String stationName;
 
+    @ApiModelProperty(value = "消息内容")
+    @TableField(exist = false)
+    private String messageBody;
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/quartz/PumpSendMessage.java

@@ -67,7 +67,7 @@ public class PumpSendMessage implements Job {
                 marqueeData.setCreateDate(new Date());
                 marqueeDataMapper.insert(marqueeData);
                 // 稳压泵漏水告警添加告警事件信息
-                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId());
+                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId(), body);
             }
 
             model.setBody(body);

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

@@ -64,7 +64,7 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
     Page<EquipmentAlarmLogDto> getEquipAlarmLog(String id, String startTime, String endTime, long pageSize, long current );
 
 
-    void pressurePumpDisposeAlarm(Long equipmentSpecificId);
+    void pressurePumpDisposeAlarm(Long equipmentSpecificId, String body);
 
     void pressurePumpRestore(Long equipmentSpecificId);
 }

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

@@ -162,7 +162,7 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
 
 
     @Override
-    public void pressurePumpDisposeAlarm(Long equipmentSpecificId) {
+    public void pressurePumpDisposeAlarm(Long equipmentSpecificId, String body) {
         EquipmentSpecific equipmentSpecific = equipmentSpecificMapper.selectById(equipmentSpecificId);
         EquipmentSpecificAlarm equipmentSpecificAlarm = new EquipmentSpecificAlarm();
         String sysCodes = null;
@@ -217,6 +217,7 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         EquipmentSpecificAlarmLog equipmentSpecificAlarmLog = new EquipmentSpecificAlarmLog();
         BeanUtils.copyProperties(equipmentSpecificAlarm, equipmentSpecificAlarmLog);
         equipmentSpecificAlarmLog.setId(null);
+        equipmentSpecificAlarmLog.setEquipmentSpecificIndexName(body);
         equipmentSpecificAlarmLog.setEquipmentSpecificAlarmId(equipmentSpecificAlarm.getId());
         equipmentSpecificAlarmLog.setEquipmentSpecificCode(equipmentSpecific.getCode());
         equipmentSpecificAlarmLog.setEquipmentId(ObjectUtils.isEmpty(equipmentIndex.getEquipmentId()) ? null : Long.parseLong(equipmentIndex.getEquipmentId()));

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

@@ -410,17 +410,18 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
                     // 火眼数据构造告警指标逻辑
                     equipmentSpecificIndex = handleTemperatureAlarm(equipmentSpeIndex, iotDatalist);
-
+                    // 告警日志表消息内容
+                    Map<String, String> messageBodyMap = new HashMap<>();
                     //管网压力、泡沫罐信息、水箱液位告警处理
                     if (iotDataVO.getKey().toLowerCase().equals(CAFS_FoamTank_FoamTankLevel.toLowerCase()) ||
                             FHS_PipePressureDetector_PipePressure.toLowerCase().equals(iotDataVO.getKey().toLowerCase()) ||
                             iotDataVO.getKey().toLowerCase().equals(CAFS_WaterTank_WaterTankLevel.toLowerCase())) {
-                        alarmFlag = doFoamTankLevel(iotDataVO, equipmentSpecificIndex);
+                        alarmFlag = doFoamTankLevel(iotDataVO, equipmentSpecificIndex, messageBodyMap);
                     }
                     //消防水池液位处理
                     if (iotDataVO.getKey().toLowerCase().equals(FHS_FirePoolDevice_WaterLevel.toLowerCase()) ||
                             iotDataVO.getKey().toLowerCase().equals(FHS_WirelessliquidDetector_WaterLevel.toLowerCase())) {
-                        alarmFlag = doWaterPoolLevel(iotDataVO, equipmentSpecificIndex);
+                        alarmFlag = doWaterPoolLevel(iotDataVO, equipmentSpecificIndex, messageBodyMap);
                     }
                     // 遥测数据生成告警事件、日志处理
                     if (iotDataVO.getKey().toLowerCase().equals(CAFS_FoamTank_FoamTankLevel.toLowerCase()) ||
@@ -433,7 +434,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
                     // 指标告警处理
                     if (equipmentSpecificIndex.getIsAlarm() != null && 1 == equipmentSpecificIndex.getIsAlarm()) {
-                        equipmentSpecificAlarms.addAll(createIndexAlarmRecord(equipmentSpecificIndex));
+                        equipmentSpecificAlarms.addAll(createIndexAlarmRecord(equipmentSpecificIndex, messageBodyMap));
                     }
                     // 遥测遥信数据推送云端kafka
                     JSONObject jsonObjectXf = new JSONObject();
@@ -595,7 +596,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
      * @param iotDataVO  iotDataVO
      * @param equipmentSpecificIndex  equipmentSpecificIndex
      */
-    private boolean doFoamTankLevel(IotDataVO iotDataVO, EquipmentSpecificIndex equipmentSpecificIndex) {
+    private boolean doFoamTankLevel(IotDataVO iotDataVO, EquipmentSpecificIndex equipmentSpecificIndex, Map<String, String> messageBody) {
         boolean alarmFlag = false;
         MessageModel model = new MessageModel();
         Map<String, Object> map = new HashMap<>();
@@ -643,6 +644,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             }
             log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
             alarmFlag = true;
+            messageBody.put("messageBody", bodyMain);
         }
         return  alarmFlag;
     }
@@ -653,7 +655,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
      * @param iotDataVO              iotDataVO
      * @param equipmentSpecificIndex equipmentSpecificIndex
      */
-    private boolean doWaterPoolLevel(IotDataVO iotDataVO, EquipmentSpecificIndex equipmentSpecificIndex) {
+    private boolean doWaterPoolLevel(IotDataVO iotDataVO, EquipmentSpecificIndex equipmentSpecificIndex, Map<String, String> messageBody) {
         boolean alarmFlag = false;
         MessageModel model = new MessageModel();
         Map<String, Object> map = fireFightingSystemMapper.getWaterPoolLevel(equipmentSpecificIndex.getEquipmentSpecificId());
@@ -708,6 +710,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
                 log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
                 alarmFlag = true;
+                messageBody.put("messageBody", bodyMain);
             }
         }
         return alarmFlag;
@@ -960,6 +963,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         equipmentSpecificAlarmLog.setId(null);
         equipmentSpecificAlarmLog.setCreateDate(new Date());
         equipmentSpecificAlarmLog.setEquipmentSpecificAlarmId(equipmentSpecificAlarm.getId());
+        equipmentSpecificAlarmLog.setEquipmentSpecificIndexName(StringUtil.isNotEmpty(equipmentSpecificAlarm.getMessageBody()) ? equipmentSpecificAlarm.getMessageBody() : equipmentSpecificAlarm.getEquipmentSpecificIndexName());
 
         //调整为按照设备归属（可归属公司或者部门)
         Map<String,Object> mapd= iEquipmentSpecificSerivce.getStationCode(equipmentSpecificAlarm.getEquipmentSpecificId());
@@ -1308,7 +1312,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         return indexStateVo;
     }
 
-    public List<EquipmentSpecificAlarm> createIndexAlarmRecord(EquipmentSpecificIndex equipmentSpcIndex) {
+    public List<EquipmentSpecificAlarm> createIndexAlarmRecord(EquipmentSpecificIndex equipmentSpcIndex, Map<String, String> messageBody) {
         // 处理火眼视频异常
         List<EquipmentSpecificAlarm> equipmentSpecificAlarms = new ArrayList<>();
         EquipmentSpecificAlarm equipmentSpecificAlarm = new EquipmentSpecificAlarm();
@@ -1348,6 +1352,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 action.setBuildId(equipmentSpcIndex.getBuildId());
                 action.setBizOrgName(equipmentSpcIndex.getBizOrgName());
                 action.setBizOrgCode(equipmentSpcIndex.getBizOrgCode());
+                action.setMessageBody(!ObjectUtils.isEmpty(messageBody) ? messageBody.get("messageBody") : "");
                 equipmentSpecificAlarms.add(action);
             }
         }
@@ -1726,7 +1731,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             marqueeData.setCreateDate(new Date());
             marqueeDataMapper.insert(marqueeData);
             // 稳压泵告警事件生成
-            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId());
+            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId(), body);
         }
 
         switch (pumpMessageEnum) {

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

@@ -172,9 +172,8 @@
 	        wles.equipment_detail_id AS equipDetailId,
 	        wles.code AS fireEquipmentCode,
 	        wles.system_id AS systemId,
-	        if(wles.code is null,wlesal.equipment_specific_name,concat(wlesal.equipment_specific_name,'(',wles.code,')')) as
-	        fireEquipmentName,
-	        concat(wlesal.equipment_specific_name,wlesal.equipment_specific_index_name) as alamContent,
+            wlesal.equipment_specific_name as fireEquipmentName,
+            wlesal.equipment_specific_index_name as alamContent,
 	        if(wlesal.confirm_type is null,'未处理','已处理') handleStatus,
 	        IF (
 	        wlesal.clean_time IS NOT NULL,