消息提醒相关信息修改bug

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

@@ -13,6 +13,7 @@ import com.yeejoin.equipmanage.mapper.MarqueeDataMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -67,7 +68,7 @@ public class PumpSendMessage implements Job {
                 marqueeData.setCreateDate(new Date());
                 marqueeDataMapper.insert(marqueeData);
                 // 稳压泵漏水告警添加告警事件信息
-                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId(), equipmentSpecific.getName() + "-" + pressurePumpEnum.getTips());
+                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId(), String.format(StringUtils.substring(recordMessage, 13), pressurePumpEnum.getTips()));
             }
             model.setBody(body);
             model.setTitle("漏水提醒");

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

@@ -1731,7 +1731,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             marqueeData.setCreateDate(new Date());
             marqueeDataMapper.insert(marqueeData);
             // 稳压泵告警事件生成
-            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId(), data.getEquipmentSpecificName() + "-" + pressurePumpEnum.getTips());
+            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId(), String.format(org.apache.commons.lang3.StringUtils.substring(recordMessage, 13), pressurePumpEnum.getTips()));
         }
 
         switch (pumpMessageEnum) {