diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7c980e0..50edc8c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7c980e0..50edc8c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB
diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
index ff33e6b..ee26bd4 100644
--- a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
Binary files differ

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7c980e0..50edc8c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB
diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
index ff33e6b..ee26bd4 100644
--- a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 259c9db..6833f12 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7c980e0..50edc8c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB
diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
index ff33e6b..ee26bd4 100644
--- a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 259c9db..6833f12 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/sim_template.xlsx b/casic-web/src/main/resources/config/temp/sim_template.xlsx
new file mode 100644
index 0000000..9dbe8a0
--- /dev/null
+++ b/casic-web/src/main/resources/config/temp/sim_template.xlsx
Binary files differ

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 8b1793e..326ce62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -157,7 +157,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
             retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         } else {
             //app角色
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 391772e..b57eb0c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -20,7 +20,7 @@
  * @since 2019-05-17
  */
 public interface IAlarmJobService extends IService<AlarmJob> {
-    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
+//    List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid);
     List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode);
 
     List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 798d312..e701fc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,16 +52,21 @@
     @Resource
     private WebSocket webSocket;
 
+//    @Override
+//    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
+//        alarmContent = converAlarmContent(alarmContent);
+//        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId, ObjectUtil.isNotEmpty(deptid)?Long.valueOf(deptid):null);
+//        return alarmJobList;
+//    }
+
     @Override
     public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) {
-    public List<Map<String, Object>> jobList(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid) {
         alarmContent = converAlarmContent(alarmContent);
         List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode);
-        Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1;
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId);
         return alarmJobList;
     }
 
+
     @Override
     public List<Map<String, Object>> jobListApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) {
         alarmContent = converAlarmContent(alarmContent);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index fc951ba..0524cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -25,7 +25,7 @@
 public interface AlarmJobMapper extends BaseMapper<AlarmJob> {
     List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope,
                                       @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
-    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
+//    List<Map<String, Object>> jobList(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("deptid") Long deptid);
 
     List<Map<String, Object>> jobListApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId,
                                          @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode);
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 5d06f5d..df377b0 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
@@ -528,9 +528,9 @@
         <if test="jobStatus!='' and jobStatus!=null">
             AND aj.JOB_STATUS = #{jobStatus}
         </if>
-        <if test="deptid!=null and deptid!=-1">
-            AND bwi.deptid = #{deptid}
-        </if>
+<!--        <if test="deptid!=null and deptid!=-1">-->
+<!--            AND bwi.deptid = #{deptid}-->
+<!--        </if>-->
 
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1c4d501..e06546d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -82,10 +82,7 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
         WHERE 1=1
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 418cf4e..e9ff987 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,12 +30,6 @@
     </select>
 
     <select id="countNowAlarmRecords" resultType="Integer">
-        SELECT count(*)
-        FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        LEFT JOIN alarm_job aj ON ar.job_id = aj.ID
-        WHERE rdv.VALID = '1'
         SELECT  count(*)
         FROM alarm_records ar
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
@@ -143,7 +137,7 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN (BD.ONLINE_STATE <![CDATA[ <> ]]> '0'  or BD.ONLINE_STATE is NULL) THEN 1 ELSE 0 END))
         AS "online",
         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS "offline",
@@ -264,9 +258,7 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS "deptid",
-        COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS
-        "coordinateY",
+
         SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
         COUNT(DISTINCT(ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
         LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index f6783ce..0d2d7e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -118,6 +118,7 @@
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<H2SDataDto> page, @Param("keywords") String keywords,
                                                 @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 
+
     List<DataPressDto> selectPressListDataScopePage(@Param("dataScope") DataScope dataScope,
                                                     @Param("page") Page<DataPressDto> page,
                                                     @Param("keywords") String keywords,
@@ -132,8 +133,7 @@
                                                 @Param("endTime") String endTime,
                                                 @Param("deptid") Long deptid);
 
-    List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
+
 
     @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude,\"VALVE_TYPE\" as valveType  from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}")
     List<ValveDto> getValvesByPipe( @Param("pipeCode") String pipeCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 522bc19..10a0817 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -265,15 +265,15 @@
     </select>
 
     <sql id="install_time_diff" databaseId="oracle">
-       datediff(current_timestamp,install_date)
+       datediff(current_timestamp,LOGTIME)
     </sql>
 
     <sql id="install_time_diff" databaseId="mysql">
-         timestampdiff(DAY,install_date,NOW())
+         timestampdiff(DAY,LOGTIME,NOW())
     </sql>
 
     <sql id="install_time_diff" databaseId="pgsql">
-      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
+      floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM LOGTIME))/86400)
     </sql>
 
     <select id="offlineListPage" resultType="java.util.Map">
@@ -283,7 +283,7 @@
         bd.device_type AS deviceType,
         bwi.well_code AS "wellCode",
         <include refid="date_toChar">
-            <property name="paramDate" value="INSTALL_DATE"/>
+            <property name="paramDate" value="LOGTIME"/>
         </include>
         AS "lastDataTs",
         <include refid="install_time_diff"/>
@@ -308,7 +308,6 @@
 
     <sql id="time_diff" databaseId="mysql">
          timestampdiff(DAY,Max(dt.logtime),NOW())
-         timestampdiff(DAY,DAY,Max(dt.logtime),NOW())
     </sql>
 
     <sql id="time_diff" databaseId="pgsql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
index 0580830..aa38ac6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java
@@ -30,21 +30,6 @@
             commConfigDTO.setTimes(Long.valueOf(configArr[5]));
         }
         if(StringUtils.isNotBlank(content.split(",", 8)[6]))
-        commConfigDTO.setIp(content.split(",", 8)[6]);
-        if(StringUtils.isNotBlank(content.split(",",8)[7]))
-        commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
-        String[] configArr= content.split(",");
-        commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])?
-                Float.valueOf(configArr[0]):null);
-        commConfigDTO.setHeight(Float.valueOf(configArr[1]));
-        commConfigDTO.setRepeat(Long.valueOf(configArr[2]));
-        if(StringUtils.isNotBlank(configArr[4])){
-            commConfigDTO.setInterval(Long.valueOf(configArr[4]));
-        }
-        if(StringUtils.isNotBlank(configArr[5])){
-            commConfigDTO.setTimes(Long.valueOf(configArr[5]));
-        }
-        if(StringUtils.isNotBlank(content.split(",", 8)[6]))
             commConfigDTO.setIp(content.split(",", 8)[6]);
         if(StringUtils.isNotBlank(content.split(",",8)[7]))
             commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7]));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
index 9ded489..651e88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
@@ -97,7 +97,7 @@
             // 配置信息转换  以逗号拼接
             String framecontent = objectMap.get("framecontent").toString();
             if (null != framecontent) {
-                String[] configItems = framecontent.split(",");
+                String[] configItems = framecontent.split(",",8);
                 dto.setThreshold(null != configItems[0] ?
                         Float.valueOf(configItems[0]) : null);
                 dto.setInstallHeight(null != configItems[1] ?
@@ -105,7 +105,8 @@
                 dto.setRetryTimes(configItems[2]);
                 dto.setPercent(null != configItems[3] ?
                         Float.valueOf(configItems[3]) : null);
-                dto.setCollectInterval(configItems[4]);
+                dto.setCollectInterval(null!=configItems[4]?
+                        configItems[4]:null);
                 dto.setCollectCount(configItems[5]);
                 if (configItems.length == 8) {
                     dto.setIp(configItems[6]);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index 11b1e44..e80a1fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -104,7 +104,7 @@
             Map<String, Object> objectMap = this.validate(deviceImeiList);
             //检验通过后写入
             if ((Boolean) objectMap.get("success")) {
-                this.addBatchImei(deviceImeiList);
+                this.saveBatch(deviceImeiList);
                 responseData.setCode(200);
                 responseData.setMessage(objectMap.get("msg").toString());
             } else {//校验失败，返回
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
index e4f137c..88eacf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,12 +66,14 @@
             deviceModelsList.forEach(
                     deviceModels -> {
                         deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType()))));
-                        String[] d = deviceModels.getCommunication().split(",");
-                        if (d.length > 0) {
-                            deviceModels.setCommunNameGroup(dictMap.get(d[0]));
-                        }
-                        for (int i = 1; i < d.length; i++) {
-                            deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        if(ObjectUtil.isNotEmpty(deviceModels.getCommunication())){
+                            String[] d = deviceModels.getCommunication().split(",");
+                            if (d.length > 0) {
+                                deviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                            }
+                            for (int i = 1; i < d.length; i++) {
+                                deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                            }
                         }
                     }
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 4d4ccff..57ed3bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("违反唯一约束")&&dax.getMessage().contains("devcode")?"设备编号重复":"设备编号重复");
         }
         return responseData;
     }
@@ -152,7 +152,7 @@
             DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
             if (null == wellDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("编号不存在");
+                gunsException.setErrorMessage("点位编号不存在");
                 throw gunsException;
             }
             if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
@@ -267,7 +267,7 @@
 
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (null == wellDto) {
-                    list.add("第" + index[0] + "行,编号不存在");
+                    list.add("第" + index[0] + "行,点位编号不存在");
                     return;
                 }
 
@@ -373,18 +373,15 @@
                 responseData.setMessage("没有数据权限");
             } else {
                 List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
-                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
-                offlineList.forEach(
-                        offlineData -> {
-                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
-                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
-                            }
-
-                        }
-                );
-//                List<Map<String, Object>> sortOfflineList = offlineList.stream().sorted(
-//                        (e1, e2) -> Integer.valueOf(String.valueOf(e1.get("offlineDays"))) - (Integer.valueOf(String.valueOf(e2.get("offlineDays"))))
-//                ).collect(Collectors.toList());
+//                Map<String, Map<String, Object>> deviceTimeList = getMapDataByType(deviceTypes);
+//                offlineList.forEach(
+//                        offlineData -> {
+//                            if (deviceTimeList.containsKey(offlineData.get("devcode"))) {
+//                                offlineData.putAll(deviceTimeList.get(offlineData.get("devcode")));
+//                            }
+//
+//                        }
+//                );
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index 0867cf3..bd66396 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -2,21 +2,21 @@
 
 
 public enum DeviceTypeEnum {
-    Well("井盖状态监测仪", 1),
-    Liquid("液位监测仪", 2),
-    WasteGas("有害气体监测仪", 3),
-    Methane("燃气智能监测终端", 4),
-    TempHumi("温湿度监测仪", 5),
-    Dig("开挖监测仪", 6),
-    WellLocator("井盖定位监测仪", 7),
-    Noise("噪声记录仪", 8),
-    TempPressure("温度压力监测仪", 9),
-    FireHydrant("消防栓防盗水监测仪", 11),
-    Tube("管盯", 12),
-    LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14),
-    PRESS("压力监测终端", 15),
-    KAD("点型可燃气体探测器", 16);
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    WasteGas("有害气体监测仪", 3,"data_harmful_gas"),
+    Methane("燃气智能监测终端", 4,"data_gas"),
+    TempHumi("温湿度监测仪", 5,"data_temp_hum"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 9,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad");
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index 4f4abf9..af1b373 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -156,14 +156,14 @@
     private int devices;
 
 
-
+    @ExcelProperty("最新在线时间")
     @TableField(exist = false)
     private String lasttimeFormat;
 
     /**
      * 最后上传时间
      */
-    @ExcelProperty("最新在线时间")
+
     @TableField("LASTTIME")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lasttime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 84fe514..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -32,9 +32,6 @@
     </sql>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
-        SELECT id AS "id",deptid AS "deptid",communication AS "communication",
-         well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
     <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 376d225..96fa7e3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -46,9 +46,9 @@
         if(deptId==0){
             return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         }
-        List<TenantDTO> dtos = tenants.stream().filter(
-                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
-        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+//        List<TenantDTO> dtos = tenants.stream().filter(
+//                tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
+//        ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
         return dtos;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index 8027c46..ffa2e46 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -30,8 +30,7 @@
         SELECT id,pipeline_code AS "pipelineCode",pipeline_type AS "pipelineType",pipe_diameter AS "pipeDiameter",
         material,bury_mode AS "buryMode",pipeline_position AS "pipelinePosition",construct_era AS "constructEra",
         deptid,start_ground_height AS "startGroundHeight",start_bury_deep AS "startBuryDeep",pipeline_name AS
-        "pipelineName",
-        start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
+        "pipelineName",start_pipecrown_height AS "startPipecrownHeight",end_ground_height AS "endGroundHeight",
         end_bury_deep AS "endBuryDeep",end_pipecrown_height AS "endPipecrownHeight",design_pressure AS "designPressure",
         instantaneous_flow AS "instantaneousFlow",ts,"start_longitude" as startLongitude,"end_latitude" as endLatitude,
         "end_longitude" as endLongitude,"start_latitude" as startLatitude,
@@ -57,7 +56,7 @@
             and pipeline_type = #{pipelineType}
         </if>
         <if test="material != null and material !=''">
-            and material   like  CONCAT  ('%',  #{material},  '%')
+            and material   = #{material}
         </if>
         <if test="pipeDiameter1 != null and pipeDiameter1 !=''">
             and pipe_diameter   <![CDATA[ >= ]]>  #{pipeDiameter1}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 1f00370..550ac59 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -66,12 +66,11 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1' and d.valid ='1'
-            JOIN bus_device  bd ON  bd.id=d.device_id and d.VALID =1
-            GROUP BY well_id
+        SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device  bd ON  bd.id=d.device_id
+        WHERE bd.VALID = '1' and d.valid ='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3b4eb2b..d92fa42 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -78,8 +78,9 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
-            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+//            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
+//            well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
@@ -266,10 +267,6 @@
     }
 
 
-    @Override
-    public String getAreaName(Long id) {
-        return this.baseMapper.getAreaName(id);
-    }
 
     @Override
     @Transactional
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1e77a1b..62f04db 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -30,6 +30,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/*
   db:
@@ -40,10 +41,10 @@
   spring-session-open: false #开启spring session
 smartcity:
   config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    export-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\export\
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    config-path: D:\code\zhajing\15gitproduct\xx\casic-smartcity\casic-web\src\main\resources\config\temp\
     download-path: D:\v1.0\
   device:
     redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7c980e0..50edc8c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB
diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
index ff33e6b..ee26bd4 100644
--- a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 259c9db..6833f12 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/sim_template.xlsx b/casic-web/src/main/resources/config/temp/sim_template.xlsx
new file mode 100644
index 0000000..9dbe8a0
--- /dev/null
+++ b/casic-web/src/main/resources/config/temp/sim_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
index 9145a70..d4e3d79 100644
--- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
Binary files differ