diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index f46e427..54a0e5b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 
 import java.text.ParseException;
 import java.util.List;
@@ -23,7 +25,7 @@
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
 
     Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index f46e427..54a0e5b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 
 import java.text.ParseException;
 import java.util.List;
@@ -23,7 +25,7 @@
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
 
     Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 21b0436..b9627a5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -145,13 +146,16 @@
         return mapList;
     }
 
-    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+    public ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent) {
         ResponseData responseData = new ResponseData();
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
-            alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
+            page.setRecords(dataScopeFilter);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
             responseData.setData(alarmWellList);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index f46e427..54a0e5b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 
 import java.text.ParseException;
 import java.util.List;
@@ -23,7 +25,7 @@
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
 
     Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 21b0436..b9627a5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -145,13 +146,16 @@
         return mapList;
     }
 
-    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+    public ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent) {
         ResponseData responseData = new ResponseData();
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
-            alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
+            page.setRecords(dataScopeFilter);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
             responseData.setData(alarmWellList);
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 6a62043..eabf7c9 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
@@ -223,30 +223,13 @@
      * 新增
      */
     @RequestMapping(value = "/add")
-    @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//      Device device = CreateDevice(deviceAddParam);
-        try {
-            deviceService.save(device);
-        } catch (Exception e) {
-            ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "设备添加失败";
-            if (e instanceof DuplicateKeyException) {
-                errorMsg = "设备编号重复";
-            } else if (e instanceof ServiceException) {
-                ServiceException gunException = (ServiceException) e;
-                errorMsg = gunException.getMessage();
-            }
-            logger.error("设备添加失败", e);
-            gunsException.setErrorMessage(errorMsg);
-            throw gunsException;
-        }
-        return ResponseData.success();
+        return deviceService.addDevice(device);
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index f46e427..54a0e5b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 
 import java.text.ParseException;
 import java.util.List;
@@ -23,7 +25,7 @@
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
 
     Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 21b0436..b9627a5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -145,13 +146,16 @@
         return mapList;
     }
 
-    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+    public ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent) {
         ResponseData responseData = new ResponseData();
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
-            alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
+            page.setRecords(dataScopeFilter);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
             responseData.setData(alarmWellList);
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 6a62043..eabf7c9 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
@@ -223,30 +223,13 @@
      * 新增
      */
     @RequestMapping(value = "/add")
-    @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//      Device device = CreateDevice(deviceAddParam);
-        try {
-            deviceService.save(device);
-        } catch (Exception e) {
-            ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "设备添加失败";
-            if (e instanceof DuplicateKeyException) {
-                errorMsg = "设备编号重复";
-            } else if (e instanceof ServiceException) {
-                ServiceException gunException = (ServiceException) e;
-                errorMsg = gunException.getMessage();
-            }
-            logger.error("设备添加失败", e);
-            gunsException.setErrorMessage(errorMsg);
-            throw gunsException;
-        }
-        return ResponseData.success();
+        return deviceService.addDevice(device);
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 7f6232e..3c05e4c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -66,6 +66,7 @@
 
 
     void deleteByIds(List<Long> ids);
+    ResponseData addDevice(Device  device);
 
     ResponseData offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
                                  String deviceCode, String deviceType);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 1e81d70..e347e36 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.datascope.DataScope;
@@ -193,8 +195,11 @@
     @RequestMapping("/alarmWellListPage")
     @ResponseBody
     public Object alarmWellListPage(String beginTime, String endTime, String alarmContent) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+        ResponseData responseData=statisticsService.alarmWellListPage(dataScope, page,beginTime, endTime, alarmContent);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index cfe58f5..73bdc38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-
-   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
+                                              @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
     List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
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 014c645..dd0541d 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
@@ -225,11 +225,13 @@
     </select>
 
     <select id="alarmWellListPage" resultType="MAP">
-        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
-        COUNT(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"
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(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",
+        bd.DEVICE_TYPE AS "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
         WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
         <if test="alarmContent!='' and alarmContent!= null">
             AND ALARM_CONTENT = #{alarmContent}
@@ -247,16 +249,16 @@
             </include>
         </if>
         GROUP BY
-        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
+        ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE,bd.DEVICE_TYPE
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID AS "deviceType"
         FROM alarm_records ar
         JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -278,12 +280,12 @@
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID AS "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
-        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
-        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
+        JOIN bus_device bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -304,7 +306,7 @@
         ORDER BY "totalAlarm" DESC
     </select>
 
-    <select id="getDeviceType"  resultType="String">
+    <select id="getDeviceType" resultType="String">
         SELECT  DEVICE_TYPE
         FROM config_dept_permission
         WHERE  DEPTID=#{deptid}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index f46e427..54a0e5b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 
 import java.text.ParseException;
 import java.util.List;
@@ -23,7 +25,7 @@
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
 
     Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 21b0436..b9627a5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -145,13 +146,16 @@
         return mapList;
     }
 
-    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+    public ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent) {
         ResponseData responseData = new ResponseData();
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
-            alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
+            page.setRecords(dataScopeFilter);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
             responseData.setData(alarmWellList);
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 6a62043..eabf7c9 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
@@ -223,30 +223,13 @@
      * 新增
      */
     @RequestMapping(value = "/add")
-    @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//      Device device = CreateDevice(deviceAddParam);
-        try {
-            deviceService.save(device);
-        } catch (Exception e) {
-            ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "设备添加失败";
-            if (e instanceof DuplicateKeyException) {
-                errorMsg = "设备编号重复";
-            } else if (e instanceof ServiceException) {
-                ServiceException gunException = (ServiceException) e;
-                errorMsg = gunException.getMessage();
-            }
-            logger.error("设备添加失败", e);
-            gunsException.setErrorMessage(errorMsg);
-            throw gunsException;
-        }
-        return ResponseData.success();
+        return deviceService.addDevice(device);
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 7f6232e..3c05e4c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -66,6 +66,7 @@
 
 
     void deleteByIds(List<Long> ids);
+    ResponseData addDevice(Device  device);
 
     ResponseData offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
                                  String deviceCode, String deviceType);
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 4a78066..a6aee1c 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
@@ -17,7 +17,9 @@
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -36,6 +38,7 @@
  * @since 2019-05-23
  */
 @Service
+@Slf4j
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService, IBusDeviceSupportService {
 
     @Autowired
@@ -67,7 +70,7 @@
      * @param isOnline
      * @return
      */
-    public  List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline){
+    public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
         return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
     }
 
@@ -84,46 +87,50 @@
     }
 
     @Override
-    public boolean save(Device entity) {
+    @Transactional
+    public ResponseData addDevice(Device entity) {
         ResponseData responseData = new ResponseData();
-        //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
-        if (wellDto == null) {
-            ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            gunsException.setErrorMessage("编号不存在");
-            return false;
-        }
-        DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
-        if (deviceType == null) {
-            ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            gunsException.setErrorMessage("设备类型不存在");
-            return false;
-        }
-
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
-        //根据集中器编号查询集中器信息
-        DeviceConcentratorDto concentratorDto = null;
-        if (isAddConcentrator) {
-            concentratorDto = this.selectDeviceConcentorByCode(entity.getConcenCode());
-            if (null == concentratorDto) {
-                ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-                gunsException.setErrorMessage("集中器编号不存在");
-                return false;
+        responseData.setCode(500);
+        try {
+            //根据井编号查询井信息
+            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+            if (wellDto == null) {
+                responseData.setMessage("点位编号不存在");
+                return responseData;
             }
+            DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
+            if (deviceType == null) {
+                responseData.setMessage("设备类型不存在");
+                return responseData;
+            }
+            boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
+            //根据集中器编号查询集中器信息
+            DeviceConcentratorDto concentratorDto = null;
+            if (isAddConcentrator) {
+                concentratorDto = this.selectDeviceConcentorByCode(entity.getConcenCode());
+                if (null == concentratorDto) {
+                    responseData.setMessage("集中器编号不存在");
+                    return responseData;
+                }
+            }
+            //设置默认值
+            entity.setOnlineState(DeviceConst.YES);
+            entity.setValid(DeviceConst.YES);
+            entity.setLogtime(new Date());
+            super.save(entity);
+            //关联设备集中器信息
+            if (isAddConcentrator) {
+                deviceConcentratorService.save(createConcentrator(entity.getId(), concentratorDto.getId()));
+            }
+            //关联设备井盖信息
+            deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId()));
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dax) {
+            log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
+            responseData.setMessage("新增异常");
         }
-        //设置默认值
-        entity.setOnlineState(DeviceConst.YES);
-        entity.setValid(DeviceConst.YES);
-        entity.setLogtime(new Date());
-        boolean flag = super.save(entity);
-
-        //关联设备集中器信息
-        if (isAddConcentrator) {
-            deviceConcentratorService.save(createConcentrator(entity.getId(), concentratorDto.getId()));
-        }
-        //关联设备井盖信息
-        deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId()));
-        return flag;
+        return responseData;
     }
 
     @Transactional
@@ -337,7 +344,7 @@
 
     @Override
     public ResponseData offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
-                                  String deviceCode, String deviceType) {
+                                        String deviceCode, String deviceType) {
         ResponseData responseData = new ResponseData();
         try {
             List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);