diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
new file mode 100644
index 0000000..f2bf811
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
@@ -0,0 +1,123 @@
+package com.casic.missiles.modular.system.controller.busconfig;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dict.BusConfigDict;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/busConfig")
+public class WellliquidController  extends ExportController {
+
+    @Resource
+    private AbstractPermissionContext service;
+
+    @Qualifier("busWellliquidServiceImpl")
+    @Autowired
+    private IBusConfigService busWellliquidService;
+
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/config")
+    @BussinessLog(value = "井盖液位一体机下发配置接口", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfig(@RequestBody BusConfigDTO busConfigDTO) {
+        try {
+            busWellliquidService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchImport")
+    @ResponseBody
+    @BussinessLog(value = "井盖液位一体机批量导入设备配置", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        try {
+            List<BusConfigDTO> busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null);
+            resultData = busWellliquidService.imp(busConfigDTOList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/list")
+    @ResponseBody
+    @BussinessLog(value = "获取井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigList(@RequestParam(required = false) String keywords,
+                                      @RequestParam(required = false) String deptid)  {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();//page使用
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchExport")
+    @ResponseBody
+    @BussinessLog(value = "批量导出井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public void wellcoverConfigBatchExport(@RequestParam(required = false) String keywords,
+                                           @RequestParam(required = false) String deptid,
+                                           HttpServletResponse response) {
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busWellliquidService.exp(busConfigDTOList, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
new file mode 100644
index 0000000..f2bf811
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
@@ -0,0 +1,123 @@
+package com.casic.missiles.modular.system.controller.busconfig;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dict.BusConfigDict;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/busConfig")
+public class WellliquidController  extends ExportController {
+
+    @Resource
+    private AbstractPermissionContext service;
+
+    @Qualifier("busWellliquidServiceImpl")
+    @Autowired
+    private IBusConfigService busWellliquidService;
+
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/config")
+    @BussinessLog(value = "井盖液位一体机下发配置接口", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfig(@RequestBody BusConfigDTO busConfigDTO) {
+        try {
+            busWellliquidService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchImport")
+    @ResponseBody
+    @BussinessLog(value = "井盖液位一体机批量导入设备配置", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        try {
+            List<BusConfigDTO> busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null);
+            resultData = busWellliquidService.imp(busConfigDTOList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/list")
+    @ResponseBody
+    @BussinessLog(value = "获取井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigList(@RequestParam(required = false) String keywords,
+                                      @RequestParam(required = false) String deptid)  {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();//page使用
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchExport")
+    @ResponseBody
+    @BussinessLog(value = "批量导出井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public void wellcoverConfigBatchExport(@RequestParam(required = false) String keywords,
+                                           @RequestParam(required = false) String deptid,
+                                           HttpServletResponse response) {
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busWellliquidService.exp(busConfigDTOList, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
index 10bdac1..8837f37 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
@@ -17,18 +17,28 @@
     @Override
     public void send(String devCode, String content, String attemptsMax) {
 
-        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+//        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+//            commConfigDTO.setIp(content.split(",", 5)[3]);
+//            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+//        }
+//        redisCommon.setRedisConfig(devCode, commConfigDTO);
+//        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+//            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
         CommConfigDTO commConfigDTO = new CommConfigDTO();
-        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
-        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
-        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
-        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
             commConfigDTO.setIp(content.split(",", 5)[3]);
             commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
         }
         redisCommon.setRedisConfig(devCode, commConfigDTO);
-        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
             redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
     }
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
new file mode 100644
index 0000000..f2bf811
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
@@ -0,0 +1,123 @@
+package com.casic.missiles.modular.system.controller.busconfig;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dict.BusConfigDict;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/busConfig")
+public class WellliquidController  extends ExportController {
+
+    @Resource
+    private AbstractPermissionContext service;
+
+    @Qualifier("busWellliquidServiceImpl")
+    @Autowired
+    private IBusConfigService busWellliquidService;
+
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/config")
+    @BussinessLog(value = "井盖液位一体机下发配置接口", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfig(@RequestBody BusConfigDTO busConfigDTO) {
+        try {
+            busWellliquidService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchImport")
+    @ResponseBody
+    @BussinessLog(value = "井盖液位一体机批量导入设备配置", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        try {
+            List<BusConfigDTO> busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null);
+            resultData = busWellliquidService.imp(busConfigDTOList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/list")
+    @ResponseBody
+    @BussinessLog(value = "获取井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigList(@RequestParam(required = false) String keywords,
+                                      @RequestParam(required = false) String deptid)  {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();//page使用
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchExport")
+    @ResponseBody
+    @BussinessLog(value = "批量导出井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public void wellcoverConfigBatchExport(@RequestParam(required = false) String keywords,
+                                           @RequestParam(required = false) String deptid,
+                                           HttpServletResponse response) {
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busWellliquidService.exp(busConfigDTOList, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
index 10bdac1..8837f37 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
@@ -17,18 +17,28 @@
     @Override
     public void send(String devCode, String content, String attemptsMax) {
 
-        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+//        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+//            commConfigDTO.setIp(content.split(",", 5)[3]);
+//            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+//        }
+//        redisCommon.setRedisConfig(devCode, commConfigDTO);
+//        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+//            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
         CommConfigDTO commConfigDTO = new CommConfigDTO();
-        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
-        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
-        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
-        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
             commConfigDTO.setIp(content.split(",", 5)[3]);
             commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
         }
         redisCommon.setRedisConfig(devCode, commConfigDTO);
-        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
             redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
     }
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
new file mode 100644
index 0000000..dd49765
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.rs;
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WellliquidRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
new file mode 100644
index 0000000..f2bf811
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
@@ -0,0 +1,123 @@
+package com.casic.missiles.modular.system.controller.busconfig;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dict.BusConfigDict;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/busConfig")
+public class WellliquidController  extends ExportController {
+
+    @Resource
+    private AbstractPermissionContext service;
+
+    @Qualifier("busWellliquidServiceImpl")
+    @Autowired
+    private IBusConfigService busWellliquidService;
+
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/config")
+    @BussinessLog(value = "井盖液位一体机下发配置接口", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfig(@RequestBody BusConfigDTO busConfigDTO) {
+        try {
+            busWellliquidService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchImport")
+    @ResponseBody
+    @BussinessLog(value = "井盖液位一体机批量导入设备配置", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        try {
+            List<BusConfigDTO> busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null);
+            resultData = busWellliquidService.imp(busConfigDTOList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/list")
+    @ResponseBody
+    @BussinessLog(value = "获取井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigList(@RequestParam(required = false) String keywords,
+                                      @RequestParam(required = false) String deptid)  {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();//page使用
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchExport")
+    @ResponseBody
+    @BussinessLog(value = "批量导出井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public void wellcoverConfigBatchExport(@RequestParam(required = false) String keywords,
+                                           @RequestParam(required = false) String deptid,
+                                           HttpServletResponse response) {
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busWellliquidService.exp(busConfigDTOList, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
index 10bdac1..8837f37 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
@@ -17,18 +17,28 @@
     @Override
     public void send(String devCode, String content, String attemptsMax) {
 
-        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+//        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+//            commConfigDTO.setIp(content.split(",", 5)[3]);
+//            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+//        }
+//        redisCommon.setRedisConfig(devCode, commConfigDTO);
+//        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+//            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
         CommConfigDTO commConfigDTO = new CommConfigDTO();
-        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
-        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
-        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
-        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
             commConfigDTO.setIp(content.split(",", 5)[3]);
             commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
         }
         redisCommon.setRedisConfig(devCode, commConfigDTO);
-        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
             redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
     }
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
new file mode 100644
index 0000000..dd49765
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.rs;
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WellliquidRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java
new file mode 100644
index 0000000..28fcf31
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java
@@ -0,0 +1,304 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.*;
+
+@AllArgsConstructor
+@Slf4j
+@Service
+public class BusWellliquidServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+
+    private final RedisCommon redisCommon;
+    private final IBaseExportService exportService;
+    private final IDeviceService iDeviceService;
+    private final IDeviceRuleService iDeviceRuleService;
+    private final DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        QueryWrapper<BusConfig> busConfigEntityWrapper = new QueryWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.removeById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.LG.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = " " + "," + " " + "," + " " + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        save(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        //发布消息订阅
+        if (StrUtil.isNotBlank(concentratorCode)) {
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                removeById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.LG.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            save(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StrUtil.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StrUtil.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = getById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.getById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StrUtil.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+//                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(List<BusConfigDTO> busConfigDTOList) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        try {
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.LG_CONFIG_EXPORT_TEMP));
+            if (CollectionUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.LG_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 0922e75..aeca8cd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -619,6 +619,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -865,6 +866,7 @@
                 </include>
             </if>
         </where>
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
index b659ccc..be33678 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java
@@ -53,18 +53,7 @@
     public boolean getJob(Long id, long deptid,Long personId) {
         Calendar now = Calendar.getInstance();
         Date getTime = now.getTime();
-        if (isWeekend(now)) {
-            now.add(Calendar.WEEK_OF_YEAR, 1);
-            now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
-            now.set(Calendar.HOUR_OF_DAY, 8);
-            now.set(Calendar.MINUTE, 0);
-            now.set(Calendar.SECOND, 0);
-        } else {
-            now.add(Calendar.HOUR, 24);
-            while (isWeekend(now)) {
-                now.add(Calendar.HOUR, 24);
-            }
-       }
+        now.add(Calendar.HOUR, 4);
         Date shouldHandleTime = now.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
@@ -145,28 +134,7 @@
 
     private void sendJob(String id, AlarmJob alarmJob, List<String> userClientList) {
         Calendar handlerTime = Calendar.getInstance();
-        if (isWeekend(handlerTime)) {
-            handlerTime.add(Calendar.WEEK_OF_YEAR, 1);
-            handlerTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-            handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-            handlerTime.set(Calendar.MINUTE, 0);
-            handlerTime.set(Calendar.SECOND, 0);
-        } else {
-            try {
-                if (isTimeRange()) {
-                    handlerTime.add(Calendar.HOUR_OF_DAY, 2);
-                } else {
-                    handlerTime.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班
-                    handlerTime.set(Calendar.MINUTE, 0);
-                    handlerTime.set(Calendar.SECOND, 0);
-                    if (!compareNoon()) {
-                        handlerTime.add(Calendar.DAY_OF_MONTH, +1);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
+        handlerTime.add(Calendar.HOUR, 1);
         Date shouldHandleTime = handlerTime.getTime();
         if (useOverTime.equals("true")) {
             System.out.println(shouldHandleTime);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
index 5b24bd7..7510132 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java
@@ -13,6 +13,8 @@
     public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx";
     public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx";
     public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx";
+    public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx";
+
     public static final String WASTEGAS_CONFIG_EXPORT_TEMP = "wasteGasconfigTemp.xlsx";
     public static final String TEMPHUMI_CONFIG_EXPORT_TEMP = "tempHumiconfigTemp.xlsx";
     public static final String DIG_CONFIG_EXPORT_TEMP = "digconfigTemp.xlsx";
@@ -24,8 +26,6 @@
      * 配置列表导出
      */
     public static final String CONFIG_EXPORT_TABLE = "configTable.xlsx";
-
-
     /**
      * 模板下载路径
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
new file mode 100644
index 0000000..f2bf811
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/WellliquidController.java
@@ -0,0 +1,123 @@
+package com.casic.missiles.modular.system.controller.busconfig;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dict.BusConfigDict;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/busConfig")
+public class WellliquidController  extends ExportController {
+
+    @Resource
+    private AbstractPermissionContext service;
+
+    @Qualifier("busWellliquidServiceImpl")
+    @Autowired
+    private IBusConfigService busWellliquidService;
+
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/config")
+    @BussinessLog(value = "井盖液位一体机下发配置接口", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfig(@RequestBody BusConfigDTO busConfigDTO) {
+        try {
+            busWellliquidService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchImport")
+    @ResponseBody
+    @BussinessLog(value = "井盖液位一体机批量导入设备配置", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        try {
+            List<BusConfigDTO> busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null);
+            resultData = busWellliquidService.imp(busConfigDTOList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/list")
+    @ResponseBody
+    @BussinessLog(value = "获取井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object wellcoverConfigList(@RequestParam(required = false) String keywords,
+                                      @RequestParam(required = false) String deptid)  {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();//page使用
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+    /**
+     * 井盖状态监测仪下发配置接口
+     */
+    @RequestMapping(value = "/wellliquidConfig/batchExport")
+    @ResponseBody
+    @BussinessLog(value = "批量导出井盖液位一体机配置表", key = "deviceId,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public void wellcoverConfigBatchExport(@RequestParam(required = false) String keywords,
+                                           @RequestParam(required = false) String deptid,
+                                           HttpServletResponse response) {
+        try {
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busWellliquidService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busWellliquidService.exp(busConfigDTOList, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
index 10bdac1..8837f37 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LGRequest.java
@@ -17,18 +17,28 @@
     @Override
     public void send(String devCode, String content, String attemptsMax) {
 
-        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+//        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+//        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+//            commConfigDTO.setIp(content.split(",", 5)[3]);
+//            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+//        }
+//        redisCommon.setRedisConfig(devCode, commConfigDTO);
+//        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+//            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
         CommConfigDTO commConfigDTO = new CommConfigDTO();
-        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
-        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
-        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
-        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
             commConfigDTO.setIp(content.split(",", 5)[3]);
             commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
         }
         redisCommon.setRedisConfig(devCode, commConfigDTO);
-        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
             redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
     }
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
new file mode 100644
index 0000000..dd49765
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/WellliquidRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.rs;
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WellliquidRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+//        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+//        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+//        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if (StringUtils.isNotBlank(content.split(",", 5)[3])) {
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())){
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+        }
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java
new file mode 100644
index 0000000..28fcf31
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java
@@ -0,0 +1,304 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.*;
+
+@AllArgsConstructor
+@Slf4j
+@Service
+public class BusWellliquidServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+
+    private final RedisCommon redisCommon;
+    private final IBaseExportService exportService;
+    private final IDeviceService iDeviceService;
+    private final IDeviceRuleService iDeviceRuleService;
+    private final DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        QueryWrapper<BusConfig> busConfigEntityWrapper = new QueryWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.removeById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.LG.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = " " + "," + " " + "," + " " + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        save(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        //发布消息订阅
+        if (StrUtil.isNotBlank(concentratorCode)) {
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                removeById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.LG.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            save(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StrUtil.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StrUtil.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = getById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.getById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StrUtil.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+//                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(List<BusConfigDTO> busConfigDTOList) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        try {
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.LG_CONFIG_EXPORT_TEMP));
+            if (CollectionUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.LG_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java
index 245f54c..bea2af2 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -73,6 +74,7 @@
      * 界面配置时间
      */
     @TableField("WRITETIME")
+    @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     private Date writetime;