Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

 package com.yeejoin.equipmanage.common.enums;
 
+
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public enum PressurePumpEnum {
-
-    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC","", "0 0/5 * * * ?", "5",
+    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_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-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -771,11 +771,12 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             }
         }
         List<Map<String, Object>> list = marqueeDataMapper.selectAll();
-        List<Map<String, Object>> records = resultPage.getRecords();
+        List<Map<String, Object>> resList = new ArrayList();
         for (Map<String, Object> stringObjectMap : list) {
-            records.add(stringObjectMap);
+            resList.add(stringObjectMap);
         }
-        records.sort((t1, t2) -> t2.get("createDate").toString().compareTo(t1.get("createDate").toString()));
+        resList.sort((t1, t2) -> t2.get("createDate").toString().compareTo(t1.get("createDate").toString()));
+        resultPage.setRecords(resList);
         return resultPage;
     }