稳压泵跑马灯消息

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

@@ -28,10 +28,10 @@ public class MarqueeData extends BaseEntity {
     /**
      * 是否已读【0：未读；1：已读】
      */
-    private String isRead;
+    private int isRead;
     /**
      * 设备id
      */
-    private String equipmentSpecificId;
+    private Long equipmentSpecificId;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpEnum.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public enum PressurePumpEnum {
 
-    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC","", "0 0/1 * * * ?", "5",
+    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC","", "0 0/5 * * * ?", "5",
             PressurePumpValueEnum.PUMP_START_TIME.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode()),
     ALONE_START_QT("FHS_PressurePump_Start_ALONE_START_QT", PressurePumpCheckEnum.LE.getCode(), "", "5",
         PressurePumpValueEnum.LAST_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpMessageEnum.java

@@ -4,8 +4,8 @@ public enum PressurePumpMessageEnum {
 
     MESSAGE_LEVEL_YB("YB", "【%s】分钟内，启停间隔较小",  "","名称：稳压泵启停异常提醒；时间：%s；内容：【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
     MESSAGE_LEVEL_YZ("YZ", "【%s】分钟内，启停间隔较小", "", "名称：稳压泵启停异常提醒；时间：%s；内容：【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
-    MESSAGE_LEVEL_QT_WJ("QT_WJ", "【%s】分钟内，设备启停频繁", "", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 【%s】分钟内，设备启停频繁，可能存在漏水，请及时查看处理"),
-    MESSAGE_LEVEL_QT_WJ_YXSC("WJ_YXSC", "运行时长超过【%s】分钟，存在漏水可能", "", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 运行时长超过【%s】分钟，存在漏水可能，请及时查看处理");
+    MESSAGE_LEVEL_QT_WJ("QT_WJ", "【%s】分钟内，设备启停频繁", "类型：漏水提醒 ；设备位置：【稳压泵设备位置】； 设备名称：【稳压泵设备名称】 ； 时间：系统推送时间", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 【%s】分钟内，设备启停频繁，可能存在漏水，请及时查看处理"),
+    MESSAGE_LEVEL_QT_WJ_YXSC("WJ_YXSC", "运行时长超过【%s】分钟，存在漏水可能", "类型：漏水提醒 ；设备位置：【稳压泵设备位置】； 设备名称：【稳压泵设备名称】 ； 时间：系统推送时间", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 运行时长超过【%s】分钟，存在漏水可能，请及时查看处理");
     private String code;
     private String allMessage;
     private String marqueeMessage;

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

@@ -2,12 +2,14 @@ package com.yeejoin.equipmanage.quartz;
 
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.MarqueeData;
 import com.yeejoin.equipmanage.common.enums.PressurePumpEnum;
 import com.yeejoin.equipmanage.common.enums.PressurePumpMessageEnum;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.Token;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
+import com.yeejoin.equipmanage.mapper.MarqueeDataMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
@@ -33,6 +35,7 @@ public class PumpSendMessage implements Job {
             PressurePumpEnum pressurePumpEnum = (PressurePumpEnum)jobDataMap.get("pressurePumpEnum");
             SystemctlFeign systemctlFeign = (SystemctlFeign)jobDataMap.get("systemctlFeign");
             RemoteSecurityService remoteSecurityService = (RemoteSecurityService)jobDataMap.get("remoteSecurityService");
+            MarqueeDataMapper marqueeDataMapper = (MarqueeDataMapper)jobDataMap.get("marqueeDataMapper");
 
             MessageModel model = new MessageModel();
             model.setSendTime(new Date());
@@ -50,6 +53,18 @@ public class PumpSendMessage implements Job {
             if (StringUtil.isNotEmpty(recordMessage)) {
                 body = String.format(recordMessage,new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()), equipmentSpecific.getName(), equipmentSpecific.getPosition(), pressurePumpEnum.getRightValue());
             }
+            String marqueeMessage = PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getMarqueeMessage();
+            if (StringUtil.isNotEmpty(marqueeMessage)) {
+                MarqueeData marqueeData = new MarqueeData();
+                marqueeData.setIsRead(0);
+                marqueeData.setEquipmentSpecificId(equipmentSpecific.getId());
+                marqueeData.setMessageType("pressurePump");
+                marqueeData.setName(equipmentSpecific.getName());
+                marqueeData.setPosition(equipmentSpecific.getPosition());
+                marqueeData.setType("漏水提醒");
+                marqueeData.setCreateDate(new Date());
+                marqueeDataMapper.insert(marqueeData);
+            }
 
             model.setBody(body);
             model.setExtras(map);

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

@@ -784,7 +784,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public int updateReadStatus(String messageId) {
         MarqueeData marqueeData = marqueeDataMapper.selectById(messageId);
-        marqueeData.setIsRead("1");
+        marqueeData.setIsRead(1);
         int i = marqueeDataMapper.updateById(marqueeData);
         MessageModel model = new MessageModel();
         model.setMsgType("pressurePump");

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

@@ -97,6 +97,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
 
+    @Autowired
+    MarqueeDataMapper marqueeDataMapper;
     /**
      * 泡沫罐KEY
      */
@@ -1476,7 +1478,15 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
         String marqueeMessage = pumpMessageEnum.getMarqueeMessage();
         if (StringUtil.isNotEmpty(marqueeMessage)) {
-//            body = String.format(marqueeMessage);
+            MarqueeData marqueeData = new MarqueeData();
+            marqueeData.setIsRead(0);
+            marqueeData.setEquipmentSpecificId(data.getEquipmentId());
+            marqueeData.setMessageType("pressurePump");
+            marqueeData.setName(data.getEquipmentSpecificName());
+            marqueeData.setPosition(data.getLocation());
+            marqueeData.setType("漏水提醒");
+            marqueeData.setCreateDate(new Date());
+            marqueeDataMapper.insert(marqueeData);
         }
 
         switch (pumpMessageEnum) {
@@ -1540,7 +1550,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 parameter.put("pressurePumpEnum", pressurePumpEnum);
                 parameter.put("remoteSecurityService", remoteSecurityService);
                 parameter.put("systemctlFeign", systemctlFeign);
-
+                parameter.put("marqueeDataMapper", marqueeDataMapper);
                 QuartzManager.addJob(jobName,PUMP_JOB_GROUP_NAME,triggerName,PUMP_TRIGGER_GROUP_NAME, PumpSendMessage.class,cron,parameter);
             }
         }