修改bug

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

@@ -6,24 +6,32 @@ import java.util.Date;
 import java.util.List;
 
 public enum PressurePumpEnum {
-    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC","", new Date().getSeconds()+" " + new Date().getMinutes() +"/5 * * * ?", "5",
-            PressurePumpValueEnum.PUMP_START_TIME.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode()),
+    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC", "", new Date().getSeconds() + " " + new Date().getMinutes() + "/5 * * * ?", "5",
+            PressurePumpValueEnum.PUMP_START_TIME.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode(), "【5】分钟"),
+
     ALONE_START_QT("FHS_PressurePump_Start_ALONE_START_QT", PressurePumpCheckEnum.LE.getCode(), "", "5",
-        PressurePumpValueEnum.LAST_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+            PressurePumpValueEnum.LAST_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode(), "【5】分钟"),
+
     ALONE_STOP_QT("FHS_PressurePump_Stop_ALONE_STOP_QT", PressurePumpCheckEnum.GE.getCode(), "5", "",
-             PressurePumpValueEnum.LAST_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode()),
+            PressurePumpValueEnum.LAST_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode(), "【5】分钟"),
+
     ALL_START_QT_WJ("FHS_PressurePump_Start_ALL_START_QT_WJ", PressurePumpCheckEnum.LE.getCode(), "", "30",
-            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode(), "【30】分钟"),
+
     ALL_START_QT_YZ("FHS_PressurePump_Start_ALL_START_QT_YZ", PressurePumpCheckEnum.BE.getCode(), "30", "60",
-             PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode()),
+            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode(), "【1】小时"),
+
     ALL_START_QT_YB("FHS_PressurePump_Start_ALL_START_QT_YB", PressurePumpCheckEnum.BE.getCode(), "60", "240",
-            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode()),
+            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode(), "【4】小时"),
+
     ALL_STOP_QT_WJ("FHS_PressurePump_Stop_ALL_STOP_QT_WJ", PressurePumpCheckEnum.LE.getCode(), "", "30",
-            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode(), "【30】分钟"),
+
     ALL_STOP_QT_YZ("FHS_PressurePump_Stop_ALL_STOP_QT_YZ", PressurePumpCheckEnum.BE.getCode(), "30", "60",
-            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode()),
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode(), "【1】小时"),
+
     ALL_STOP_QT_YB("FHS_PressurePump_Stop_ALL_STOP_QT_YB", PressurePumpCheckEnum.BE.getCode(), "60", "240",
-            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode());
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode(), "【4】小时");
 
     private String code;
     private String operator;
@@ -31,14 +39,16 @@ public enum PressurePumpEnum {
     private String rightValue;
     private String compareValue;
     private String level;
+    private String tips;
 
-    private PressurePumpEnum(String code, String operator, String leftValue, String rightValue, String compareValue, String level) {
+    PressurePumpEnum(String code, String operator, String leftValue, String rightValue, String compareValue, String level, String tips) {
         this.code = code;
         this.operator = operator;
         this.leftValue = leftValue;
         this.rightValue = rightValue;
         this.compareValue = compareValue;
         this.level = level;
+        this.tips = tips;
     }
 
     public static List<PressurePumpEnum> getEnumListByCode(String code) {
@@ -65,4 +75,5 @@ public enum PressurePumpEnum {
     }
     public String getCompareValue() { return compareValue; }
     public String getLevel() { return level; }
+    public String getTips() { return tips; }
 }

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

@@ -2,10 +2,10 @@ package com.yeejoin.equipmanage.common.enums;
 
 public enum PressurePumpMessageEnum {
 
-    MESSAGE_LEVEL_YB("YB", "【%s】分钟内，启停间隔较小",  "","【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
-    MESSAGE_LEVEL_YZ("YZ", "【%s】分钟内，启停间隔较小", "", "【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
-    MESSAGE_LEVEL_QT_WJ("QT_WJ", "【%s】分钟内，设备启停频繁", "类型：漏水提醒 ；设备位置：【稳压泵设备位置】； 设备名称：【稳压泵设备名称】 ； 时间：系统推送时间", "【%s】- 【%s】 - 【%s】分钟内，设备启停频繁，可能存在漏水，请及时查看处理"),
-    MESSAGE_LEVEL_QT_WJ_YXSC("WJ_YXSC", "运行时长超过【%s】分钟，存在漏水可能", "类型：漏水提醒 ；设备位置：【稳压泵设备位置】； 设备名称：【稳压泵设备名称】 ； 时间：系统推送时间", "【%s】- 【%s】 - 运行时长超过【%s】分钟，存在漏水可能，请及时查看处理");
+    MESSAGE_LEVEL_YB("YB", "%s内，启停间隔较小",  "","【%s】- 【%s】 -  %s内，设备启停频繁，请及时查看处理"),
+    MESSAGE_LEVEL_YZ("YZ", "%s内，启停间隔较小", "", "【%s】- 【%s】 -  %s内，设备启停频繁，请及时查看处理"),
+    MESSAGE_LEVEL_QT_WJ("QT_WJ", "%s内，设备启停频繁", "类型：漏水提醒 ；设备位置：【稳压泵设备位置】； 设备名称：【稳压泵设备名称】 ； 时间：系统推送时间", "【%s】- 【%s】 - %s内，设备启停频繁，可能存在漏水，请及时查看处理"),
+    MESSAGE_LEVEL_QT_WJ_YXSC("WJ_YXSC", "运行时长超过%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

@@ -43,7 +43,7 @@ public class PumpSendMessage implements Job {
             Map<String, String> map = new HashMap<>(4);
             String allMessage = PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getAllMessage();
             if (StringUtil.isNotEmpty(allMessage)) {
-                String content = String.format(allMessage, pressurePumpEnum.getRightValue());
+                String content = String.format(allMessage, pressurePumpEnum.getTips());
                 map.put("content", content);
                 map.put("type", "漏水提醒");
                 map.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()));
@@ -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, equipmentSpecific.getName(), equipmentSpecific.getPosition(), pressurePumpEnum.getRightValue());
+                body = String.format(recordMessage, equipmentSpecific.getName(), equipmentSpecific.getPosition(), pressurePumpEnum.getTips());
             }
             String marqueeMessage = PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getMarqueeMessage();
             if (StringUtil.isNotEmpty(marqueeMessage)) {

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

@@ -495,6 +495,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         MessageModel model = new MessageModel();
         Map<String, Object> map = fireFightingSystemMapper.getWaterPoolLevel(equipmentSpecificIndex.getEquipmentSpecificId());
         if (!ObjectUtils.isEmpty(map)) {
+            BigDecimal minValues = new BigDecimal(map.get("minValues").toString());
             BigDecimal minValue = getBigDecimal(map.get("minValues"));
             BigDecimal maxValue = getBigDecimal(map.get("maxValues"));
             BigDecimal nowValue = getBigDecimal(iotDataVO.getValue());
@@ -557,7 +558,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             } else if( value instanceof BigInteger) {
                 val = new BigDecimal( (BigInteger) value );
             } else if( value instanceof Number ) {
-                val = new BigDecimal( ((Number)value).doubleValue() );
+                val = new BigDecimal(String.valueOf(value));
             } else {
                 throw new ClassCastException("Not possible to coerce ["+value+"] from class "+value.getClass()+" into a BigDecimal.");
             }
@@ -1456,7 +1457,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         String body = "";
         Map<String, String> map = new HashMap<>(4);
         if (StringUtil.isNotEmpty(allMessage)) {
-            String value = StringUtil.isNotEmpty(pressurePumpEnum.getLeftValue()) ? pressurePumpEnum.getLeftValue() : pressurePumpEnum.getRightValue();
+            String value = StringUtil.isNotEmpty(pressurePumpEnum.getTips()) ? pressurePumpEnum.getTips() : "";
             String content = String.format(allMessage, value);
             map.put("content", content);
             map.put("name", data.getEquipmentSpecificName());
@@ -1464,7 +1465,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
         String recordMessage = pumpMessageEnum.getRecordMessage();
         if (StringUtil.isNotEmpty(recordMessage)) {
-            String value = StringUtil.isNotEmpty(pressurePumpEnum.getLeftValue()) ? pressurePumpEnum.getLeftValue() : pressurePumpEnum.getRightValue();
+            String value = StringUtil.isNotEmpty(pressurePumpEnum.getTips()) ? pressurePumpEnum.getTips() : "";
             body = String.format(recordMessage, data.getEquipmentSpecificName(), data.getLocation(), value);
         }
         String marqueeMessage = pumpMessageEnum.getMarqueeMessage();