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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
index 979e8be..7ad00c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
@@ -29,4 +29,7 @@
      */
     List<BusConcentrator> selectConcentratorPage(@Param("page") Page<BusConcentrator> page, @Param("scope") DataScope dataScope,
                                                  @Param("keywords") String keywords, @Param("status") String status);
+
+
+    Long getDeptById(@Param("deptName") String deptName);
 }

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
index 979e8be..7ad00c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
@@ -29,4 +29,7 @@
      */
     List<BusConcentrator> selectConcentratorPage(@Param("page") Page<BusConcentrator> page, @Param("scope") DataScope dataScope,
                                                  @Param("keywords") String keywords, @Param("status") String status);
+
+
+    Long getDeptById(@Param("deptName") String deptName);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 4627f26..7e75c9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -33,4 +33,12 @@
         ORDER by SETUPDATE DESC
     </select>
 
+
+    <select id="getDeptById" resultType="java.lang.Long" >
+        SELECT  id
+        from sys_dept
+        where simple_name =#{deptName}
+    </select>
+
+
 </mapper>

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
index 979e8be..7ad00c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
@@ -29,4 +29,7 @@
      */
     List<BusConcentrator> selectConcentratorPage(@Param("page") Page<BusConcentrator> page, @Param("scope") DataScope dataScope,
                                                  @Param("keywords") String keywords, @Param("status") String status);
+
+
+    Long getDeptById(@Param("deptName") String deptName);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 4627f26..7e75c9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -33,4 +33,12 @@
         ORDER by SETUPDATE DESC
     </select>
 
+
+    <select id="getDeptById" resultType="java.lang.Long" >
+        SELECT  id
+        from sys_dept
+        where simple_name =#{deptName}
+    </select>
+
+
 </mapper>
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 04df1e5..2705256 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
@@ -195,7 +195,7 @@
         SELECT id,
                devcode,
                deviceName,
-               deviceType,
+               device_Type,
                deviceTypeName,
                wellId,
                deptid,
@@ -210,7 +210,6 @@
                lngGaode
         FROM device_overview_view  dov
         LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
-
         WHERE valid = '1'
     </select>
 
@@ -277,19 +276,20 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT
         bd.devcode AS devcode,
-        bdt.TYPE_NAME AS deviceTypeName,
+        bdt.TYPE_NAME AS "deviceTypeName",
         bd.device_type AS deviceType,
-        bwi.well_code AS wellCode,
+        bwi.well_code AS "wellCode",
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALL_DATE"/>
-        </include> AS "lastDataTs",
+        </include>
+        AS "lastDataTs",
         <include refid="install_time_diff"/>
         AS "offlineDays"
         FROM bus_device bd
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE  bd.online_State = '0'
+        WHERE bd.online_State = '0'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
@@ -318,7 +318,7 @@
         FROM ${tableName} dt
         JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
         where online_state='0'
-        GROUP  BY  bd.devcode
+        GROUP BY bd.devcode
     </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
index 979e8be..7ad00c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
@@ -29,4 +29,7 @@
      */
     List<BusConcentrator> selectConcentratorPage(@Param("page") Page<BusConcentrator> page, @Param("scope") DataScope dataScope,
                                                  @Param("keywords") String keywords, @Param("status") String status);
+
+
+    Long getDeptById(@Param("deptName") String deptName);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 4627f26..7e75c9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -33,4 +33,12 @@
         ORDER by SETUPDATE DESC
     </select>
 
+
+    <select id="getDeptById" resultType="java.lang.Long" >
+        SELECT  id
+        from sys_dept
+        where simple_name =#{deptName}
+    </select>
+
+
 </mapper>
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 04df1e5..2705256 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
@@ -195,7 +195,7 @@
         SELECT id,
                devcode,
                deviceName,
-               deviceType,
+               device_Type,
                deviceTypeName,
                wellId,
                deptid,
@@ -210,7 +210,6 @@
                lngGaode
         FROM device_overview_view  dov
         LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
-
         WHERE valid = '1'
     </select>
 
@@ -277,19 +276,20 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT
         bd.devcode AS devcode,
-        bdt.TYPE_NAME AS deviceTypeName,
+        bdt.TYPE_NAME AS "deviceTypeName",
         bd.device_type AS deviceType,
-        bwi.well_code AS wellCode,
+        bwi.well_code AS "wellCode",
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALL_DATE"/>
-        </include> AS "lastDataTs",
+        </include>
+        AS "lastDataTs",
         <include refid="install_time_diff"/>
         AS "offlineDays"
         FROM bus_device bd
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE  bd.online_State = '0'
+        WHERE bd.online_State = '0'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
@@ -318,7 +318,7 @@
         FROM ${tableName} dt
         JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
         where online_state='0'
-        GROUP  BY  bd.devcode
+        GROUP BY bd.devcode
     </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index edc076a..e32089e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,6 +19,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
+import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -86,12 +87,13 @@
                     );
                     return;
                 }
-                if (new Long(0L).equals(busConcentrator.getDeptid())) {
-                    busConcentrator.setDeptid(commonPermissionService.getAuthService().getLoginUser().getDeptId());
-                } else {
-                    if (StrUtil.isEmpty(commonPermissionService.getDeptService().getDeptName(busConcentrator.getDeptid()))) {
+                if (StrUtil.isNotEmpty(busConcentrator.getDeptName())) {
+                    Long deptid = this.baseMapper.getDeptById(busConcentrator.getDeptName());
+                    if (ObjectUtil.isEmpty(deptid)) {
                         list.add(" 第" + index[0] + "行，权属单位不存在");
                         return;
+                    }else {
+                        busConcentrator.setDeptid(deptid);
                     }
                 }
 
@@ -109,13 +111,15 @@
                 //地图坐标转换
                 loadPostion(busConcentrator);
                 busConcentrator.setValid(DeviceConst.YES);
+                busConcentrator.setLasttime(new Date());
                 busConcentrator.setTs(new Date());
                 busConcentrator.setStatus(DeviceConst.NO);
             });
             if (CollectionUtil.isNotEmpty(list)) {
-                return ResponseData.success();
+                return ResponseData.success(list.get(0));
             }
             try {
+//                results.stream().
                 this.saveBatch(results);
             } catch (DataAccessException ex) {
                 log.error("主题，集中器批量导入模板保存数据库出现异常，异常信息为{}", ex);
@@ -133,7 +137,7 @@
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
         if (e instanceof DataAccessException) {
             DataAccessException mybatisPlusException = (DataAccessException) e;
-            String message =mybatisPlusException.getRootCause().getMessage();
+            String message = mybatisPlusException.getRootCause().getMessage();
             if (message.contains("Duplicate entry '")) {
                 return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", ""));
             }

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 5dcebf1..1f24dac 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
@@ -405,8 +405,8 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-");
-        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString());
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4279f7b..31483e6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -772,8 +772,7 @@
     </select>
 
     <select id="selectTubeDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40767b3..6e94b5d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -71,7 +71,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
@@ -112,7 +112,7 @@
         <if test="keywords != null and keywords !=''">
             and (bd.DEVCODE like
             <include refid="keywords_sql"/>
-            OR bwi.wellCode LIKE
+            OR bwi.well_Code LIKE
             <include refid="keywords_sql"/>
             )
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9959ef3..4925084 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -262,10 +262,10 @@
     @RequestMapping(value = "/offline-list-page")
     @ResponseBody
     @BussinessLog(value = "离线设备列表")
-    public Object offlineListPage(String deviceCode, String deviceType) {
+    public Object offlineListPage(String devcode, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+        ResponseData responseData = deviceService.offlineListPage(dataScope, page, devcode, deviceType);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
index 979e8be..7ad00c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java
@@ -29,4 +29,7 @@
      */
     List<BusConcentrator> selectConcentratorPage(@Param("page") Page<BusConcentrator> page, @Param("scope") DataScope dataScope,
                                                  @Param("keywords") String keywords, @Param("status") String status);
+
+
+    Long getDeptById(@Param("deptName") String deptName);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 4627f26..7e75c9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -33,4 +33,12 @@
         ORDER by SETUPDATE DESC
     </select>
 
+
+    <select id="getDeptById" resultType="java.lang.Long" >
+        SELECT  id
+        from sys_dept
+        where simple_name =#{deptName}
+    </select>
+
+
 </mapper>
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 04df1e5..2705256 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
@@ -195,7 +195,7 @@
         SELECT id,
                devcode,
                deviceName,
-               deviceType,
+               device_Type,
                deviceTypeName,
                wellId,
                deptid,
@@ -210,7 +210,6 @@
                lngGaode
         FROM device_overview_view  dov
         LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
-
         WHERE valid = '1'
     </select>
 
@@ -277,19 +276,20 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT
         bd.devcode AS devcode,
-        bdt.TYPE_NAME AS deviceTypeName,
+        bdt.TYPE_NAME AS "deviceTypeName",
         bd.device_type AS deviceType,
-        bwi.well_code AS wellCode,
+        bwi.well_code AS "wellCode",
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALL_DATE"/>
-        </include> AS "lastDataTs",
+        </include>
+        AS "lastDataTs",
         <include refid="install_time_diff"/>
         AS "offlineDays"
         FROM bus_device bd
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE  bd.online_State = '0'
+        WHERE bd.online_State = '0'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
@@ -318,7 +318,7 @@
         FROM ${tableName} dt
         JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
         where online_state='0'
-        GROUP  BY  bd.devcode
+        GROUP BY bd.devcode
     </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index edc076a..e32089e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,6 +19,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
+import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -86,12 +87,13 @@
                     );
                     return;
                 }
-                if (new Long(0L).equals(busConcentrator.getDeptid())) {
-                    busConcentrator.setDeptid(commonPermissionService.getAuthService().getLoginUser().getDeptId());
-                } else {
-                    if (StrUtil.isEmpty(commonPermissionService.getDeptService().getDeptName(busConcentrator.getDeptid()))) {
+                if (StrUtil.isNotEmpty(busConcentrator.getDeptName())) {
+                    Long deptid = this.baseMapper.getDeptById(busConcentrator.getDeptName());
+                    if (ObjectUtil.isEmpty(deptid)) {
                         list.add(" 第" + index[0] + "行，权属单位不存在");
                         return;
+                    }else {
+                        busConcentrator.setDeptid(deptid);
                     }
                 }
 
@@ -109,13 +111,15 @@
                 //地图坐标转换
                 loadPostion(busConcentrator);
                 busConcentrator.setValid(DeviceConst.YES);
+                busConcentrator.setLasttime(new Date());
                 busConcentrator.setTs(new Date());
                 busConcentrator.setStatus(DeviceConst.NO);
             });
             if (CollectionUtil.isNotEmpty(list)) {
-                return ResponseData.success();
+                return ResponseData.success(list.get(0));
             }
             try {
+//                results.stream().
                 this.saveBatch(results);
             } catch (DataAccessException ex) {
                 log.error("主题，集中器批量导入模板保存数据库出现异常，异常信息为{}", ex);
@@ -133,7 +137,7 @@
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
         if (e instanceof DataAccessException) {
             DataAccessException mybatisPlusException = (DataAccessException) e;
-            String message =mybatisPlusException.getRootCause().getMessage();
+            String message = mybatisPlusException.getRootCause().getMessage();
             if (message.contains("Duplicate entry '")) {
                 return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", ""));
             }
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 4c15f2f..2f2f701 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
@@ -378,8 +378,12 @@
                             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());
                 page.setRecords(offlineList);
                 responseData.setCode(200);
                 responseData.setMessage("查询成功");