Merge remote-tracking branch 'origin/develop_dl' into develop_dl

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

@@ -67,9 +67,8 @@ public class PumpSendMessage implements Job {
                 marqueeData.setCreateDate(new Date());
                 marqueeDataMapper.insert(marqueeData);
                 // 稳压泵漏水告警添加告警事件信息
-                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId(), body);
+                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId(), equipmentSpecific.getName() + "-" + pressurePumpEnum.getTips());
             }
-
             model.setBody(body);
             model.setTitle("漏水提醒");
             model.setExtras(map);

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

@@ -644,7 +644,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             }
             log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
             alarmFlag = true;
-            messageBody.put("messageBody", bodyMain);
+            messageBody.put("messageBody", equipmentSpecificIndex.getEquipmentSpecificName() + "-" + body);
         }
         return  alarmFlag;
     }
@@ -710,7 +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);
+                messageBody.put("messageBody", map.get("name") + "-" + body);
             }
         }
         return alarmFlag;
@@ -1731,7 +1731,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             marqueeData.setCreateDate(new Date());
             marqueeDataMapper.insert(marqueeData);
             // 稳压泵告警事件生成
-            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId(), body);
+            equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(data.getEquipmentId(), data.getEquipmentSpecificName() + "-" + pressurePumpEnum.getTips());
         }
 
         switch (pumpMessageEnum) {