稳压泵消息模板修改

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

@@ -51,7 +51,7 @@ public class PumpSendMessage implements Job {
             }
             String recordMessage = PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getRecordMessage();
             if (StringUtil.isNotEmpty(recordMessage)) {
-                body = String.format(recordMessage,new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()), equipmentSpecific.getName(), equipmentSpecific.getPosition(), pressurePumpEnum.getRightValue());
+                body = String.format(recordMessage, equipmentSpecific.getName(), equipmentSpecific.getPosition(), pressurePumpEnum.getRightValue());
             }
             String marqueeMessage = PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getMarqueeMessage();
             if (StringUtil.isNotEmpty(marqueeMessage)) {
@@ -67,7 +67,9 @@ public class PumpSendMessage implements Job {
             }
 
             model.setBody(body);
+            model.setTitle("漏水提醒");
             model.setExtras(map);
+            model.setRelationId(String.valueOf(equipmentSpecific.getId()));
             model.setMsgType("pressurePump");
             model.setIsSendApp(false);
             model.setTerminal("WEB");

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

@@ -1474,7 +1474,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         String recordMessage = pumpMessageEnum.getRecordMessage();
         if (StringUtil.isNotEmpty(recordMessage)) {
             String value = StringUtil.isNotEmpty(pressurePumpEnum.getLeftValue()) ? pressurePumpEnum.getLeftValue() : pressurePumpEnum.getRightValue();
-            body = String.format(recordMessage,time, data.getEquipmentSpecificName(), data.getLocation(), value);
+            body = String.format(recordMessage, data.getEquipmentSpecificName(), data.getLocation(), value);
         }
         String marqueeMessage = pumpMessageEnum.getMarqueeMessage();
         if (StringUtil.isNotEmpty(marqueeMessage)) {
@@ -1514,6 +1514,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         model.setCategory(1);
         List<String> receive = new ArrayList<>();
         receive.add("system");
+        model.setRelationId(String.valueOf(data.getEquipmentSpecificId()));
         model.setRecivers(receive);
         Token token = remoteSecurityService.getServerToken();
         systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);