diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID
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 bbaf5db..3b8f9e2 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
@@ -18,7 +18,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
-public interface IDeviceService extends IService<Device>{
+public interface IDeviceService extends IService<Device> {
 
     /**
      * 根据条件分页查询设备列表
@@ -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,String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -49,13 +49,16 @@
     List<String> addDeviceBatch(List<Device> results);
 
 
-
     void deleteByIds(List<Long> ids);
 
+    Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                           String deviceCode, String deviceType);
+
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID
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 bbaf5db..3b8f9e2 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
@@ -18,7 +18,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
-public interface IDeviceService extends IService<Device>{
+public interface IDeviceService extends IService<Device> {
 
     /**
      * 根据条件分页查询设备列表
@@ -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,String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -49,13 +49,16 @@
     List<String> addDeviceBatch(List<Device> results);
 
 
-
     void deleteByIds(List<Long> ids);
 
+    Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                           String deviceCode, String deviceType);
+
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index 3684994..cbb7ac1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -24,6 +24,6 @@
 
     int countDeviceByType(Serializable typeId);
 
-    DeviceType selectDeviceTypeById(String id);
+    DeviceType selectDeviceTypeById(Long id);
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID
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 bbaf5db..3b8f9e2 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
@@ -18,7 +18,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
-public interface IDeviceService extends IService<Device>{
+public interface IDeviceService extends IService<Device> {
 
     /**
      * 根据条件分页查询设备列表
@@ -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,String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -49,13 +49,16 @@
     List<String> addDeviceBatch(List<Device> results);
 
 
-
     void deleteByIds(List<Long> ids);
 
+    Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                           String deviceCode, String deviceType);
+
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index 3684994..cbb7ac1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -24,6 +24,6 @@
 
     int countDeviceByType(Serializable typeId);
 
-    DeviceType selectDeviceTypeById(String id);
+    DeviceType selectDeviceTypeById(Long 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 0a17a5d..f33f275 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
@@ -36,7 +36,7 @@
  * @since 2019-05-23
  */
 @Service
-public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService,IBusDeviceSupportService {
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService, IBusDeviceSupportService {
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -68,7 +68,7 @@
 
     @Override
     public boolean save(Device entity) {
-        ResponseData responseData=new ResponseData();
+        ResponseData responseData = new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
@@ -303,9 +303,6 @@
     }
 
 
-
-
-
     @Override
     public void deleteByIds(List<Long> ids) {
         if (CollectionUtil.isNotEmpty(ids)) {
@@ -322,6 +319,24 @@
     }
 
     @Override
+    public Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                                  String deviceCode, String deviceType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            page.setRecords(offlineList);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (Exception ex) {
+            log.error("主题：离线查询异常，设备型号" + deviceCode + "，" +
+                    "设备编号:" + deviceType + ",异常信息{}" + ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    @Override
     public List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus) {
         return this.baseMapper.selectDevicesByConfig(dataScope, deviceType, configStatus);
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID
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 bbaf5db..3b8f9e2 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
@@ -18,7 +18,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
-public interface IDeviceService extends IService<Device>{
+public interface IDeviceService extends IService<Device> {
 
     /**
      * 根据条件分页查询设备列表
@@ -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,String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -49,13 +49,16 @@
     List<String> addDeviceBatch(List<Device> results);
 
 
-
     void deleteByIds(List<Long> ids);
 
+    Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                           String deviceCode, String deviceType);
+
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index 3684994..cbb7ac1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -24,6 +24,6 @@
 
     int countDeviceByType(Serializable typeId);
 
-    DeviceType selectDeviceTypeById(String id);
+    DeviceType selectDeviceTypeById(Long 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 0a17a5d..f33f275 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
@@ -36,7 +36,7 @@
  * @since 2019-05-23
  */
 @Service
-public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService,IBusDeviceSupportService {
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService, IBusDeviceSupportService {
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -68,7 +68,7 @@
 
     @Override
     public boolean save(Device entity) {
-        ResponseData responseData=new ResponseData();
+        ResponseData responseData = new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
@@ -303,9 +303,6 @@
     }
 
 
-
-
-
     @Override
     public void deleteByIds(List<Long> ids) {
         if (CollectionUtil.isNotEmpty(ids)) {
@@ -322,6 +319,24 @@
     }
 
     @Override
+    public Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                                  String deviceCode, String deviceType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            page.setRecords(offlineList);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (Exception ex) {
+            log.error("主题：离线查询异常，设备型号" + deviceCode + "，" +
+                    "设备编号:" + deviceType + ",异常信息{}" + ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    @Override
     public List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus) {
         return this.baseMapper.selectDevicesByConfig(dataScope, deviceType, configStatus);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
index c1ee623..067a044 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
@@ -33,7 +33,7 @@
     }
 
     @Override
-    public DeviceType selectDeviceTypeById(String id) {
+    public DeviceType selectDeviceTypeById(Long id) {
         return this.baseMapper.selectById(id);
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index b183bfa..a1d5d40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -70,6 +70,9 @@
         }
         for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) {
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString());
+            if (deviceTypeName == null) {
+                continue;
+            }
             List<String> names = new ArrayList<>();
             if (deviceTypeName.contains("液位")) {
                 names.add("液位");
@@ -171,43 +174,35 @@
     }
 
 
-    /**
-     * 获取详情信息
-     */
-    @RequestMapping(value = "/detail/{id}")
-    @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        System.out.println("--------------------------------------------");
-        System.out.println(dataScope);
-        System.out.println("--------------------------------------------");
-        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
-        return ResponseData.success(alarmLevel);
-
-    }
-
-
-    @RequestMapping(value = "/delete/{id}")
-    @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
-    }
-
-
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add(@RequestBody AlarmLevel alarmLevel) {
-        System.out.println(alarmLevel.toString());
-        return alarmLevelService.add(alarmLevel);
-
+        return alarmLevelService.addAlarmLevel(alarmLevel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.update(alarmLevel);
+        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    }
 
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 89e07f9..47f47f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,6 +22,6 @@
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
     AlarmLevel selectByID(Long id, DataScope dataScope);
     ResponseData deleteById(Long id);
-    ResponseData add(AlarmLevel alarmLevel);
-    ResponseData update(AlarmLevel alarmLevel);
+    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
+    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 728842c..419a76d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 123
@@ -26,7 +26,7 @@
 public class AlarmLevelServiceImpl extends ServiceImpl<AlarmLevelMapper, AlarmLevel> implements IAlarmLevelService {
     @Override
     public Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenGroup(tenantId,name);
+        return this.baseMapper.selectByNameAndTenGroup(tenantId, name);
     }
 
     @Override
@@ -42,54 +42,53 @@
 
     @Override
     public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id,dataScope);
+        return this.baseMapper.selectByID(Id, dataScope);
     }
 
     @Override
-    public ResponseData deleteById(Long Id) {
+    public ResponseData deleteById(Long id) {
+        ResponseData responseData = new ResponseData();
         QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",Id);
+        wrapper.eq("id", id);
         boolean flag = this.remove(wrapper);
-        if(flag == true){
-            ResponseData responseData=new ResponseData();
+        if (flag == true) {
             responseData.setCode(200);
-            responseData.setMessage("success");
-            return responseData;
+            responseData.setMessage("删除成功");
+        } else {
+            responseData.setCode(500);
+            responseData.setMessage("数据不存在");
         }
-        else{
-            return ResponseData.error("数据不存在");
-        }
-
+        return responseData;
     }
 
     @Override
-    public ResponseData add(AlarmLevel alarmLevel) {
+    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.save(alarmLevel);
-            resultData.setMessage("success");
-            return ResponseData.success();
+            resultData.setMessage("新增成功！");
+            resultData.setCode(200);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
+            resultData.setCode(500);
+            resultData.error("插入异常");
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
-
+        return resultData;
     }
 
     @Override
-    public ResponseData update(AlarmLevel alarmLevel) {
+    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
             this.updateById(alarmLevel);
-            resultData.setMessage("success");
+            resultData.setCode(200);
+            resultData.setMessage("更新成功！");
             return ResponseData.success();
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
+            resultData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
-            return ResponseData.error("更新异常");
-        }
-
+        return ResponseData.error("更新异常");
     }
 
 }
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 8e00943..73ccbd8 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
@@ -216,7 +216,7 @@
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-//        Device device = CreateDevice(deviceAddParam);
+//      Device device = CreateDevice(deviceAddParam);
         try {
             deviceService.save(device);
         } catch (Exception e) {
@@ -259,6 +259,17 @@
         return ResponseData.success();
     }
 
+    /**
+     * 离线设备列表
+     */
+    @RequestMapping(value = "/offline/listpage")
+    @ResponseBody
+    @BussinessLog(value = "离线设备列表")
+    public Object offlineListPage(String deviceCode,String deviceType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType);
+    }
 
     /**
      * 修改
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 53359ac..e9bb4c8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -71,7 +71,7 @@
     public Object add(DeviceType deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString());
+            DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId());
             if (resultObjct != null) {
                 responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
                 responseData.setMessage("设备类型编号重复");
@@ -125,7 +125,6 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(DeviceType deviceType) {
-
         deviceTypeService.updateById(deviceType);
         return ResponseData.success();
     }
@@ -136,7 +135,6 @@
     @RequestMapping(value = "/detail/{deviceTypeId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
-
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
 }
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 b071dc8..244e9ff 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,13 +20,22 @@
  */
 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("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("isOnline") String isOnline);
+
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
+
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
+
+    List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+
     /**
      * 查询设备信息
+     *
      * @param id 设备主键
      * @return
      */
@@ -33,7 +43,7 @@
 
     List<DeviceInWellInfo> getDeviceInWellInfo(@Param("id") Long id);
 
-    DeviceDto   getDetailById(@Param("id")String  id);
+    DeviceDto getDetailById(@Param("id") String id);
 
 
 }
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 dd22d3a..c1516f3 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
@@ -91,7 +91,7 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
-        a.INSTALL_HEIGHT  AS  "installHeight",
+        a.INSTALL_HEIGHT AS "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
 
         d.DEPTID
@@ -210,6 +210,18 @@
         )
     </select>
 
+    <select id="offlineListPage" resultType="MAP">
+        SELECT dv.ID as "id", bdt.TYPE_NAME as "typeName",wellcode,POSITION AS "position",DEPTID AS "deptid"
+        FROM   device_view  dv,base_device_type  bdt
+        WHERE    dv.deviceType=bdt.ID
+        <if test="deviceType != null and deviceType !=''">
+            AND  dv.deviceType= #{deviceType}
+        </if>
+        AND dv.onlineState='0'
+        <if test="deviceCode != null and deviceCode !=''">
+        AND  DEVCODE = #{deviceCode}
+        </if>
+    </select>
 
     <select id="getDetailById" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT id as "wellId", WELL_CODE as "WELLCODE", DEPTID
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 bbaf5db..3b8f9e2 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
@@ -18,7 +18,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
-public interface IDeviceService extends IService<Device>{
+public interface IDeviceService extends IService<Device> {
 
     /**
      * 根据条件分页查询设备列表
@@ -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,String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -49,13 +49,16 @@
     List<String> addDeviceBatch(List<Device> results);
 
 
-
     void deleteByIds(List<Long> ids);
 
+    Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                           String deviceCode, String deviceType);
+
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index 3684994..cbb7ac1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -24,6 +24,6 @@
 
     int countDeviceByType(Serializable typeId);
 
-    DeviceType selectDeviceTypeById(String id);
+    DeviceType selectDeviceTypeById(Long 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 0a17a5d..f33f275 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
@@ -36,7 +36,7 @@
  * @since 2019-05-23
  */
 @Service
-public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService,IBusDeviceSupportService {
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService, IBusDeviceSupportService {
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -68,7 +68,7 @@
 
     @Override
     public boolean save(Device entity) {
-        ResponseData responseData=new ResponseData();
+        ResponseData responseData = new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
@@ -303,9 +303,6 @@
     }
 
 
-
-
-
     @Override
     public void deleteByIds(List<Long> ids) {
         if (CollectionUtil.isNotEmpty(ids)) {
@@ -322,6 +319,24 @@
     }
 
     @Override
+    public Object offlineListPage(DataScope dataScope, Page<Map<String, Object>> page,
+                                  String deviceCode, String deviceType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            page.setRecords(offlineList);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (Exception ex) {
+            log.error("主题：离线查询异常，设备型号" + deviceCode + "，" +
+                    "设备编号:" + deviceType + ",异常信息{}" + ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    @Override
     public List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus) {
         return this.baseMapper.selectDevicesByConfig(dataScope, deviceType, configStatus);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
index c1ee623..067a044 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
@@ -33,7 +33,7 @@
     }
 
     @Override
-    public DeviceType selectDeviceTypeById(String id) {
+    public DeviceType selectDeviceTypeById(Long id) {
         return this.baseMapper.selectById(id);
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java
index cbe95c7..249eca8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java
@@ -26,7 +26,7 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 型号名称