diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */
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 6ee7572..71eea35 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
@@ -31,7 +31,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell);
 
     /**
      * 根据闸井编号查询闸井ID

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */
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 6ee7572..71eea35 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
@@ -31,7 +31,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell);
 
     /**
      * 根据闸井编号查询闸井ID
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 a160d27..beb5506 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
@@ -216,6 +216,8 @@
         List<Map<String, String>> area3List =   this.baseMapper.selectDept3List();
         //加入班组字段
         List<Map<String, String>>  dept3List=   this.baseMapper.selectArea3List();
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell) {
+        List<DeviceDto> list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell);
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
@@ -227,6 +229,7 @@
                 deviceDto.setCompanyName(companyName);
                 deviceDto.setCompanyId(dept.getPid());
             }
+            deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4));
             area3List.forEach(area3->{
                 if(deviceDto.getWellCode().equals(area3.get("wellCode"))){
                     deviceDto.setAreaName3(area3.get("areaName3"));

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */
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 6ee7572..71eea35 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
@@ -31,7 +31,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell);
 
     /**
      * 根据闸井编号查询闸井ID
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 a160d27..beb5506 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
@@ -216,6 +216,8 @@
         List<Map<String, String>> area3List =   this.baseMapper.selectDept3List();
         //加入班组字段
         List<Map<String, String>>  dept3List=   this.baseMapper.selectArea3List();
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell) {
+        List<DeviceDto> list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell);
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
@@ -227,6 +229,7 @@
                 deviceDto.setCompanyName(companyName);
                 deviceDto.setCompanyId(dept.getPid());
             }
+            deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4));
             area3List.forEach(area3->{
                 if(deviceDto.getWellCode().equals(area3.get("wellCode"))){
                     deviceDto.setAreaName3(area3.get("areaName3"));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index a1bd665..6c2b464 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */
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 6ee7572..71eea35 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
@@ -31,7 +31,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell);
 
     /**
      * 根据闸井编号查询闸井ID
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 a160d27..beb5506 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
@@ -216,6 +216,8 @@
         List<Map<String, String>> area3List =   this.baseMapper.selectDept3List();
         //加入班组字段
         List<Map<String, String>>  dept3List=   this.baseMapper.selectArea3List();
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell) {
+        List<DeviceDto> list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell);
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
@@ -227,6 +229,7 @@
                 deviceDto.setCompanyName(companyName);
                 deviceDto.setCompanyId(dept.getPid());
             }
+            deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4));
             area3List.forEach(area3->{
                 if(deviceDto.getWellCode().equals(area3.get("wellCode"))){
                     deviceDto.setAreaName3(area3.get("areaName3"));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index a1bd665..6c2b464 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index cc31d9b..a4a2fdd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -291,7 +291,8 @@
         WHERE w.VALID='1'
         AND dw.VALID='1'
         <if test="keywords != null and keywords !=''">
-            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+            and (w.WELL_CODE like <include refid="keywords_sql"/>
+            or w.POSITION like <include refid="keywords_sql"/> )
         </if>
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 42bce77..55d6989 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -162,7 +162,7 @@
 
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
 
 
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 9917a82..63906f7 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
@@ -87,7 +87,7 @@
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+    public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
@@ -97,8 +97,8 @@
             deptIds.add(Long.valueOf(deptid));
         }
 
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
-
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         page.setRecords(list);
 
@@ -218,7 +218,7 @@
     @Permission
     @ResponseBody
     public void batchExport(String keywords, String deviceType, String deptid, String beginTime,
-                            String endTime, String isOnline, HttpServletResponse response)  {
+                            String endTime, String isOnline, String maxCell, HttpServletResponse response)  {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
@@ -229,7 +229,9 @@
             deptIds = permissionService.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline);
+
+        float cell = ToolUtil.isEmpty(maxCell) ? 0 : Float.parseFloat(maxCell);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, cell);
 
         ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 04f9892..4ed73db 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -21,7 +21,7 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
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 2bc9dfd..bf93abe 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -86,6 +86,9 @@
         <if test="isOnline != null and isOnline !=''">
             and onlineState = #{isOnline}
         </if>
+        <if test="maxCell != null and maxCell != 0">
+            and cast(cell as DECIMAL) <![CDATA[ < ]]> #{maxCell}
+        </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="endtime_sql"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index e92b4f7..453644e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -21,6 +21,10 @@
     @Length(max = 15, min = 12)
     @Excel(name = "井编号", orderNum = "7")
     private String wellCode;
+
+    @Excel(name = "井名称", orderNum = "8")
+    private String wellName;
+
     /**
      * 设备编号
      */
@@ -47,8 +51,11 @@
     private String deptid;
     @Excel(name = "使用单位", orderNum = "5")
     private String deptName;
-    @Excel(name = "安装时间", orderNum = "8")
+    @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
+    @Excel(name = "安装年份", orderNum = "10")
+    private String installYear;
+
     @Excel(name = "设备位置", orderNum = "4")
     private String position;
     private Long concenId;
@@ -81,7 +88,15 @@
     /**
      * 设备厂商
      */
+    @Excel(name = "设备厂商", orderNum = "11")
     private String manufacture;
+
+    /**
+     * 电池电量
+     */
+    @Excel(name = "电池电量", orderNum = "12")
+    private String cell;
+
     /**
      * 闸井名称
      */
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 6ee7572..71eea35 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
@@ -31,7 +31,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell);
 
     /**
      * 根据闸井编号查询闸井ID
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 a160d27..beb5506 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
@@ -216,6 +216,8 @@
         List<Map<String, String>> area3List =   this.baseMapper.selectDept3List();
         //加入班组字段
         List<Map<String, String>>  dept3List=   this.baseMapper.selectArea3List();
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline, float maxCell) {
+        List<DeviceDto> list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell);
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
@@ -227,6 +229,7 @@
                 deviceDto.setCompanyName(companyName);
                 deviceDto.setCompanyId(dept.getPid());
             }
+            deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4));
             area3List.forEach(area3->{
                 if(deviceDto.getWellCode().equals(area3.get("wellCode"))){
                     deviceDto.setAreaName3(area3.get("areaName3"));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index a1bd665..6c2b464 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index cc31d9b..a4a2fdd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -291,7 +291,8 @@
         WHERE w.VALID='1'
         AND dw.VALID='1'
         <if test="keywords != null and keywords !=''">
-            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+            and (w.WELL_CODE like <include refid="keywords_sql"/>
+            or w.POSITION like <include refid="keywords_sql"/> )
         </if>
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index cdef423..767181e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -322,7 +322,7 @@
     @Override
     public List<BatchExportDataDto> getBatchExportData(DataScope dataScope, Page<BatchExportDataDto> page, String deviceType, String deptid, String keywords) {
         List<Long> deptIds = new ArrayList<>();
-        if (!deptid.isEmpty()) {
+        if (ToolUtil.isNotEmpty(deptid)) {
             deptIds = service.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }