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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long 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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param 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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String 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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private 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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..401b722 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..401b722 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 8402675..0e0012f 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..401b722 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 8402675..0e0012f 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
index f118688..19af71a 100644
--- a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
Binary files differ

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 a1d5d40..d0d09c4 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
@@ -3,28 +3,23 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -145,7 +140,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -174,36 +168,33 @@
     }
 
 
-    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.addAlarmLevel(alarmLevel);
+    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @RequestMapping(value = "/level/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmLevel alarmLevel) {
-        return alarmLevelService.updateAlarmLevel(alarmLevel);
+    public Object update(@RequestBody  AlarmLevelParam alarmLevelParam) {
+        return alarmLevelService.updateAlarmLevel(alarmLevelParam);
     }
 
     /**
      * 获取详情信息
      */
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/level/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}")
+    @RequestMapping(value = "/level/delete")
     @ResponseBody
-    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
-        return alarmLevelService.deleteById(id);
+    public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
+        return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index ecbac82..4653893 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -47,6 +47,7 @@
     private IAlarmRecordsService alarmRecordsService;
     @Resource
     private AbstractPermissionContext iCommonPermissionService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -62,7 +63,6 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object alarmList(HttpServletRequest httpServletRequest) {
-
         String keywords = httpServletRequest.getParameter("keywords");
         String beginTime = httpServletRequest.getParameter("beginTime");
         String endTime = httpServletRequest.getParameter("endTime");
@@ -185,7 +185,7 @@
         recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
         recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString());
         recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
-        recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString());
         return recordExcelDto;
     }
@@ -227,9 +227,9 @@
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime);
         //根据jobId调用closeJob
-//        for (AlarmRecords alarmRecord : alarmRecords) {
-//            alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId());
-//        }
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId());
+        }
         return ResponseData.success();
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
@@ -79,7 +78,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +86,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +157,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 8dff963..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,51 +1,44 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
 
 @Slf4j
 @Controller
-@RequestMapping("/alarmtype")
-public class AlarmTypeConfigController {
+@RequestMapping("/alarmContent")
+public class AlarmTypeConfigController extends BaseController {
     @Autowired
     private IAlarmContentTypeService alarmContentTypeService;
 
-
-
-
-
-    @RequestMapping(value = "/detail/{id}")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object selectById(@PathVariable(name = "id") Long id){
-        return alarmContentTypeService.selectById(id);
-
+    public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
     @ResponseBody
-    public Object delete(@PathVariable(name = "id") Long Id){
+    public Object delete(@PathVariable(name = "id") Long Id) {
         return alarmContentTypeService.deleteById(Id);
 
     }
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmContentType alarmContentType){
+    public Object add(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.add(alarmContentType);
 
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public Object update(@RequestBody AlarmContentType alarmContentType){
+    public Object update(@RequestBody AlarmContentType alarmContentType) {
         return alarmContentTypeService.update(alarmContentType);
-
     }
 
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
new file mode 100644
index 0000000..0d7c10d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.alarm.model;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AlarmLevelParam {
+    private String tenantId;
+    private String name;
+    private String deviceType;
+    private String openAlarm;
+    private String openJob;
+    //等级列表
+    private List<Object> levelList;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
index 0e6063f..a4492d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -1,14 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 
 public interface IAlarmContentTypeService extends IService<AlarmContentType> {
-    ResponseData selectById(Long id);
+    ResponseData selectListPage(String alarmType, String deviceType, String alarmContent);
+
     ResponseData deleteById(Long id);
+
     ResponseData add(AlarmContentType AlarmContentType);
+
     ResponseData update(AlarmContentType AlarmContentType);
 }
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 47f47f5..5119f2c 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -10,18 +11,24 @@
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface IAlarmLevelService extends IService<AlarmLevel> {
-    Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
+    Map<String, Object> selectByNameAndTenGroup(Long tenantId, String name);
+
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+
     AlarmLevel selectByID(Long id, DataScope dataScope);
-    ResponseData deleteById(Long id);
-    ResponseData addAlarmLevel(AlarmLevel alarmLevel);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData deleteByCondition(String deviceType, String name, String tenantId);
+
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 6feabf6..0bff8ec 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,72 +1,87 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.stereotype.Service;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+
+
     @Override
-    public ResponseData selectById(Long id){
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            responseData.setData(this.getById(id));
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
-            return responseData;
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型查询异常，异常信息{}", ex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
         }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
-            return ResponseData.error("插入异常");
-        }
+        return responseData;
     }
+
     @Override
-    public ResponseData add(AlarmContentType AlarmContentType){
+    public ResponseData add(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.save(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型插入异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
 
     @Override
-    public ResponseData update(AlarmContentType AlarmContentType){
+    public ResponseData update(AlarmContentType AlarmContentType) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.updateById(AlarmContentType));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型更新异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
     @Override
-    public ResponseData deleteById(Long id){
+    public ResponseData deleteById(Long id) {
         ResponseData responseData = new ResponseData();
         try {
             responseData.setData(this.removeById(id));
             responseData.setMessage("success");
             responseData.setCode(200);
             return responseData;
-        }
-        catch (AcceptPendingException ex){
-            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+        } catch (AcceptPendingException ex) {
+            log.error("主题:报警内容类型删除异常，异常信息{}", ex);
             return ResponseData.error("插入异常");
         }
     }
+
+    private void supplementData(List<Map<String, Object>> alarmContentTypeList) {
+        alarmContentTypeList.forEach(
+                alarmType -> {
+                    alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
+                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                }
+        );
+    }
 }
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 419a76d..94188bf 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
@@ -1,16 +1,22 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.channels.AcceptPendingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,29 +52,31 @@
     }
 
     @Override
-    public ResponseData deleteById(Long id) {
+    public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
-        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        boolean flag = this.remove(wrapper);
-        if (flag == true) {
+        try {
+            Long deviceTypes = StrUtil.isEmpty(deviceType) ? null : Long.valueOf(deviceType);
+            Long tenantIds = StrUtil.isEmpty(tenantId) ? null : Long.valueOf(tenantId);
+            this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds);
+            responseData.setMessage("删除成功！");
             responseData.setCode(200);
-            responseData.setMessage("删除成功");
-        } else {
+        } catch (DataAccessException ex) {
+            log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             responseData.setCode(500);
-            responseData.setMessage("数据不存在");
+            responseData.error("删除异常");
         }
         return responseData;
     }
 
     @Override
-    public ResponseData addAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.save(alarmLevel);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置新增出现异常，异常信息{}", ex);
             resultData.setCode(500);
             resultData.error("插入异常");
@@ -77,18 +85,37 @@
     }
 
     @Override
-    public ResponseData updateAlarmLevel(AlarmLevel alarmLevel) {
+    @Transactional
+    public ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            this.updateById(alarmLevel);
+            saveAlarmLevel(alarmLevelParam);
             resultData.setCode(200);
             resultData.setMessage("更新成功！");
             return ResponseData.success();
-        } catch (AcceptPendingException ex) {
+        } catch (DataAccessException ex) {
             log.error("主题:报警等级配置更新出现异常，异常信息{}", ex);
             resultData.setCode(500);
         }
         return ResponseData.error("更新异常");
     }
 
+    private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+        QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
+                .eq("NAME", alarmLevelParam.getName())
+                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("TENANT_ID", alarmLevelParam.getTenantId());
+        this.baseMapper.delete(queryWrapper);
+        AlarmLevel alarmLevel = new AlarmLevel();
+        alarmLevel.setName(alarmLevelParam.getName());
+        alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
+        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
+        alarmLevelParam.getLevelList().forEach(
+                alarmLevels -> {
+                    alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString()));
+                    this.save(alarmLevel);
+                }
+        );
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 5ea0e69..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,16 +31,17 @@
 
     /**
      * 根据权属单位统计闸井数量
+     *
      * @return
      */
     @RequestMapping(value = "/wellStaticsByDept")
     @ResponseBody
-    public Object wellStaticsByDept(){
+    public Object wellStaticsByDept() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByDept(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByDept(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -50,12 +52,12 @@
      */
     @RequestMapping(value = "/wellStaticsByType")
     @ResponseBody
-    public Object wellStaticsByType(){
+    public Object wellStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.wellStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.wellStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -66,12 +68,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByType")
     @ResponseBody
-    public Object deviceStaticsByType(){
+    public Object deviceStaticsByType() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByType(dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByType(dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -82,12 +84,12 @@
      */
     @RequestMapping(value = "/deviceStaticsByDept")
     @ResponseBody
-    public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){
+    public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.deviceStaticsByDept(dataScope,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByDept(dataScope, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -98,28 +100,53 @@
      */
     @RequestMapping(value = "/deviceStaticsByStatus")
     @ResponseBody
-    public Object deviceStaticsByStatus(){
+    public Object deviceStaticsByStatus() {
+        ResponseData responseData = new ResponseData();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            Map<String,Object> res = statisticsService.deviceStaticsByStatus(dataScope);
-            return ResponseData.success(res);
-        }catch (Exception e){
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatus(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
             e.printStackTrace();
-            return ResponseData.error("faliure");
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
         }
+        return responseData;
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
     @ResponseBody
-    public Object jobsByDept(String beginTime, String endTime, String deviceType){
+    public Object jobsByDept(String beginTime, String endTime, String deviceType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType);
+        try {
+            List<Map<String, Object>> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -130,14 +157,14 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow(){
+    public Object alarmsNow() {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
+        try {
             List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total",alarmNowViews.size());
+            res.put("total", alarmNowViews.size());
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
@@ -148,17 +175,47 @@
      */
     @RequestMapping("/alarmsByDay")
     @ResponseBody
-    public Object alarmsByDay(String beginTime, String endTime){
+    public Object alarmsByDay(String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        try{
-            List<Map<String,Object>> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope);
+        try {
+            List<Map<String, Object>> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope);
             return ResponseData.success(res);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseData.error("faliure");
         }
     }
 
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmContent
+     * @return
+     */
+    @RequestMapping("/alarmWellListPage")
+    @ResponseBody
+    public Object alarmWellListPage(String beginTime, String endTime,String  alarmContent) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent);
+    }
+
+    /**
+     *   报警井排名
+     * @param beginTime
+     * @param endTime
+     * @param alarmType
+     * @return
+     */
+    @RequestMapping("/alarmtype/count")
+    @ResponseBody
+    public Object getAlarmCountBytype(String beginTime, String endTime,String  alarmType) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return  statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType);
+    }
+
+
+
 
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 1b54b38..6a75e47 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -1,9 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.core.datascope.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.AlarmContentType;
-import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,4 +17,9 @@
  * @since 2019-10-15
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+
+    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
+                                             @Param("deviceType") String deviceType,
+                                             @Param("alarmContent") String alarmContent);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index d7f0da5..9828e15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -21,4 +21,7 @@
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
     AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    int deleteByCondition(@Param("deviceType")Long deviceType,
+                          @Param("name")String name,
+                          @Param("tenantId")Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7a226d9..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -6,12 +6,28 @@
 import java.util.List;
 import java.util.Map;
 
-public interface StatisticMapper{
-    List<Map<String,Object>> wellStaticsByDept(@Param("dataScope")DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByType(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType);
-    Map<String,Object> deviceStaticsByStatus(@Param("deptIds")String deptIds);
-    List<Map<String,Object>> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType);
-    Map<String,Object> jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
+public interface StatisticMapper {
+    List<Map<String, Object>> wellStaticsByDept(@Param("dataScope") DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
+    List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
+
+    Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+   List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                              @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
+
+    List<Map<String,Object>>  getAlarmCountBytype(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+                                                  @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index c12b51d..2f9c47c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -18,22 +18,38 @@
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
-    List<Map<String,Object>> getTypeViaName(@Param("typeName") String typeName);
-    List<Map<String,Object>> getTypeViaCode(@Param("code") String code);
-    List<Map<String,Object>> getAlarmContent(@Param("alarmType") String alarmType,@Param("deviceType") String devType);
-    List<Map<String,Object>> testPage(@Param("page") Page<Map<String,Object>> page);
+    List<Map<String, Object>> getTypeViaName(@Param("typeName") String typeName);
+
+    List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
+
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+
+    List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
+
     String getDeviceTypeNameById(@Param("deviceTypeId") Long deviceTypeId);
+
     String getDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
+
     String getAlarmContentName(@Param("id") int id);
+
     int getAlarmContentByName(@Param("sName") String sName);
+
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
+
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
-    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
-//    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
+
+    String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum, @Param("code") String code);
+
+    Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+
+    //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
+
     String getUsernameById(@Param("id") long id);
-    Map<String,Object> getUserInfoById(@Param("id") long id);
-    Long getUserByDept(@Param("deptid")Long deptid);
+
+    Map<String, Object> getUserInfoById(@Param("id") long id);
+
+    Long getUserByDept(@Param("deptid") Long deptid);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
new file mode 100644
index 0000000..c8c28f7
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.AlarmContentTypeMapper">
+
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%'||#{alarmContent}||'%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{alarmContent},'%')
+    </sql>
+
+    <select id="selectListPage" resultType="MAP">
+        SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
+        ALARM_CONTENT AS "alarmContent",ID AS id
+        FROM base_alarm_content_type
+        WHERE 1=1
+        <if test="alarmType != null and alarmType !=''">
+            AND ALARM_TYPE= #{alarmType}
+        </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND DEVICE_TYPE = #{deviceType}
+        </if>
+        <if test="alarmContent != null and alarmContent !=''">
+            AND ALARM_CONTENT like
+            <include refid="keywords_sql"/>
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index f513a60..c4ea3dd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmLevel">
-        <id column="ID" property="id" />
-        <result column="NAME" property="name" />
-        <result column="DEVICE_TYPE" property="deviceType" />
-        <result column="LEVEL" property="level" />
-        <result column="LOW_VALUE" property="lowValue" />
-        <result column="HIGH_VALUE" property="highValue" />
-        <result column="OPEN_ALARM" property="openAlarm" />
-        <result column="OPEN_JOB" property="openJob" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="NAME" property="name"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="LEVEL" property="level"/>
+        <result column="LOW_VALUE" property="lowValue"/>
+        <result column="HIGH_VALUE" property="highValue"/>
+        <result column="OPEN_ALARM" property="openAlarm"/>
+        <result column="OPEN_JOB" property="openJob"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +22,7 @@
         LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm",
         OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts
     </sql>
-    
+
     <select id="selectByNameAndTenGroup" resultType="map">
         SELECT
             OPEN_ALARM AS "openAlarm",
@@ -36,11 +36,11 @@
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
-          <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>
         FROM `alarm_level`
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
     </select>
-    
+
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
         SELECT
         <include refid="Base_Column_List"/>
@@ -55,4 +55,29 @@
         WHERE ID = #{id}
     </select>
 
+    <delete id="deleteByCondition">
+        DELETE
+        FROM alarm_level
+        WHERE
+        <choose>
+            <when test="(deviceType != null and deviceType != '')  or (tenantId != null and tenantId != '')
+                   or (name != null and name != '')">
+                1=1
+                <if test="deviceType!='' and deviceType!=null">
+                    AND DEVICE_TYPE = #{deviceType}
+                </if>
+                <if test="name!='' and name!=null">
+                    AND NAME= #{name}
+                </if>
+                <if test="tenantId!='' and tenantId!=null">
+                    AND TENANT_ID = #{tenantId}
+                </if>
+            </when>
+            <otherwise>
+                1=0
+            </otherwise>
+        </choose>
+
+    </delete>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 2f1d126..6d45309 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -17,7 +17,9 @@
     <select id="getNowAlarmRecords" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC
+        FROM alarm_now_view w
+        WHERE 1 = 1
+        ORDER BY alarmTimeDate DESC
     </select>
 
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 1954d24..91e3d13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -181,7 +181,7 @@
 
     <update id="cancelAlarm" flushCache="true">
         UPDATE alarm_records
-        SET  status = 2
+        SET    status = 2
         WHERE ID = #{id}
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index fc1634b..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -106,11 +106,19 @@
 
 
 
+
+
+
+
          and datediff(now(),aj.create_time) < ${paramDay}
 
 
 
 
+
+
+
+
         ]]>
     </sql>
 
@@ -118,18 +126,35 @@
         <![CDATA[
 
 
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
 
 
+
+
+
+
         ]]>
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
         <![CDATA[
+
+
+
+
          and date_part(now(),aj.create_time) < ${paramDay}
+
+
+
+
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -148,6 +173,27 @@
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
     </select>
 
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
+        count(1) AS total,bdt.TYPE_NAME AS "typeName"
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID,
+        base_device_type bdt
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+        AND bdt.id=BD.DEVICE_TYPE
+        GROUP BY bdt.id
+    </select>
+
     <select id="jobsByDept" resultType="map">
         SELECT
         bwi.DEPTID AS deptid,
@@ -236,4 +282,55 @@
             </choose>
         </where>
     </select>
+
+    <select id="alarmWellListPage" resultType="MAP">
+        SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid,
+        COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY",
+        LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode"
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE
+        WHERE ar.WELL_CODE is not null and ar.WELL_CODE != ''
+        <if test="alarmContent!='' and alarmContent!= null">
+            AND ALARM_CONTENT = #{alarmContent}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ar.WELL_CODE
+        ORDER BY alarmCount DESC
+    </select>
+
+    <select id="getAlarmCountBytype" resultType="MAP">
+        SELECT ALARM_CONTENT,COUNT(*) AS "alarmCount",DEPTID AS deptid
+        FROM alarm_records ar
+        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        WHERE 1=1
+        <if test="alarmType!='' and alarmType!= null">
+            AND ALARM_TYPE = #{alarmType}
+        </if>
+        <if test="beginTime!='' and beginTime!= null">
+            AND ALARM_TIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime!='' and endTime!= null">
+            AND ALARM_TIME <![CDATA[ <=]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        GROUP BY ALARM_CONTENT,deptid
+        ORDER BY alarmCount DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 4efffef..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -7,11 +7,23 @@
 import java.util.Map;
 
 public interface IStatisticsService {
-    List<Map<String,Object>> wellStaticsByDept(DataScope dataScope);
-    List<Map<String,Object>> wellStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByType(DataScope dataScope);
-    List<Map<String,Object>> deviceStaticsByDept(DataScope dataScope,String deviceType);
-    Map<String,Object> deviceStaticsByStatus(DataScope dataScope);
-    List<Map<String,Object>> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException;
-    List<Map<String, Object>> alarmsByDay(String beginTime,String endTime,DataScope dataScope);
+    List<Map<String, Object>> wellStaticsByDept(DataScope dataScope);
+
+    List<Map<String, Object>> wellStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByType(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByDept(DataScope dataScope, String deviceType);
+
+    List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
+
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
+    List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
+
+    List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
+
+    Object  alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent);
+
+    Object  getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index affce72..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -4,11 +4,14 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AlarmNowViewMapper;
 import com.casic.missiles.modular.system.dao.StatisticMapper;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IStatisticsService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class StatisticServiceImpl implements IStatisticsService {
     @Resource
@@ -66,13 +70,17 @@
     }
 
     @Override
-    public Map<String, Object> deviceStaticsByStatus(DataScope dataScope) {
+    public List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        Map<String, Object> map = statisticMapper.deviceStaticsByStatus(deptIds);
-        for (String s : map.keySet()) { //value都转为string
-            map.replace(s, map.get(s).toString());
-        }
-        return map;
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatus(deptIds);
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
     }
 
     @Override
@@ -133,4 +141,40 @@
         }
         return mapList;
     }
+
+    public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+
+    public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType);
+            alarmWellList.forEach(
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+            );
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+            responseData.setData(alarmWellList);
+        } catch (DataAccessException ex) {
+            log.error("主题：报警井查询出现异常，异常信息{}", ex);
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index ff3be2e..7eed6c3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -278,7 +278,7 @@
 
 
     /**
-     * 温湿度数据查询
+     * 温湿度压力数据查询
      *
      * @param keywords
      * @param deptid
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
new file mode 100644
index 0000000..5d71e35
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
@@ -0,0 +1,140 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.ServiceException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织业务支持配置控制器
+ *
+ * @author dev
+ * @Date 2019-05-28 15:08:56
+ */
+@Controller
+@RequestMapping("/config")
+public class DeptConfigController  extends BaseController {
+
+    @Autowired
+    private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext service;
+
+    /**
+     * 获取组织业务支持配置列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(String condition) {
+        return deptPermissionService.list(null);
+    }
+
+    /**
+     * 获取组织业务支持配置分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(String condition) {
+        Page<DeptPermission> page = PageFactory.defaultPage();
+        ;
+        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
+        page = deptPermissionService.page(page, query);
+        return super.packForBT(page);
+    }
+
+    /**
+     * 新增组织业务支持配置
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(DeptPermission deptPermission) {
+        deptPermissionService.save(deptPermission);
+        return ResponseData.success();
+    }
+
+    /**
+     * 删除组织业务支持配置
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(@RequestParam String deptPermissionId) {
+        deptPermissionService.removeById(deptPermissionId);
+        return ResponseData.success();
+    }
+
+    /**
+     * 批量删除
+     */
+    @RequestMapping(value = "/batchDelete")
+    @ResponseBody
+    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
+        deptPermissionService.removeByIds(deptPermissionIds);
+        return ResponseData.success();
+    }
+
+    /**
+     * 修改组织业务支持配置
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(DeptPermission deptPermission) {
+        deptPermissionService.updateById(deptPermission);
+        return ResponseData.success();
+    }
+
+    @GetMapping(value = "/getAuthorByDept")
+    @ResponseBody
+    public Object getAuthorByDept() {
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+
+        //递归查询组织相关配置数据
+        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
+        if (deptPermission != null) {
+            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
+            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
+            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
+        }
+        resultData.setData(deptPermission);
+        return resultData;
+    }
+
+
+    @GetMapping(value = "/getAreaByDept")
+    @ResponseBody
+    public Object getAreaByDept(Long deptId) {
+        if (deptId == null) {
+            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
+        }
+        SuccessResponseData resultData = new SuccessResponseData();
+        resultData.setCode(200);
+        resultData.setMessage("查询详情成功");
+        //递归查询组织相关配置数据
+        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
+        return resultData;
+    }
+
+    /**
+     * 组织业务支持配置详情
+     */
+    @RequestMapping(value = "/detail/{deptPermissionId}")
+    @ResponseBody
+    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
+        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
deleted file mode 100644
index a769652..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.exception.ServiceException;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
-import com.casic.missiles.modular.system.model.DeptPermission;
-import com.casic.missiles.modular.system.service.IDeptPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 组织业务支持配置控制器
- *
- * @author dev
- * @Date 2019-05-28 15:08:56
- */
-@Controller
-@RequestMapping("/config")
-public class DeptPermissionController extends BaseController {
-
-
-    @Autowired
-    private IDeptPermissionService deptPermissionService;
-    @Resource
-    private AbstractPermissionContext service;
-
-    /**
-     * 获取组织业务支持配置列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(String condition) {
-        return deptPermissionService.list(null);
-    }
-
-    /**
-     * 获取组织业务支持配置分页列表
-     */
-    @RequestMapping(value = "/listPage")
-    @ResponseBody
-    public Object listPage(String condition) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ;
-        QueryWrapper<DeptPermission> query = new QueryWrapper<>();
-        page = deptPermissionService.page(page, query);
-        return super.packForBT(page);
-    }
-
-    /**
-     * 新增组织业务支持配置
-     */
-    @RequestMapping(value = "/add")
-    @ResponseBody
-    public Object add(DeptPermission deptPermission) {
-        deptPermissionService.save(deptPermission);
-        return ResponseData.success();
-    }
-
-    /**
-     * 删除组织业务支持配置
-     */
-    @RequestMapping(value = "/delete")
-    @ResponseBody
-    public Object delete(@RequestParam String deptPermissionId) {
-        deptPermissionService.removeById(deptPermissionId);
-        return ResponseData.success();
-    }
-
-    /**
-     * 批量删除
-     */
-    @RequestMapping(value = "/batchDelete")
-    @ResponseBody
-    public Object delete(@RequestParam("deptPermissionIds") List<String> deptPermissionIds) {
-        deptPermissionService.removeByIds(deptPermissionIds);
-        return ResponseData.success();
-    }
-
-    /**
-     * 修改组织业务支持配置
-     */
-    @RequestMapping(value = "/update")
-    @ResponseBody
-    public Object update(DeptPermission deptPermission) {
-        deptPermissionService.updateById(deptPermission);
-        return ResponseData.success();
-    }
-
-    @GetMapping(value = "/getAuthorByDept")
-    @ResponseBody
-    public Object getAuthorByDept() {
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-
-        //递归查询组织相关配置数据
-        DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId());
-        if (deptPermission != null) {
-            deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class));
-            deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class));
-            deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class));
-        }
-        resultData.setData(deptPermission);
-        return resultData;
-    }
-
-
-    @GetMapping(value = "/getAreaByDept")
-    @ResponseBody
-    public Object getAreaByDept(Long deptId) {
-        if (deptId == null) {
-            throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-        }
-        SuccessResponseData resultData = new SuccessResponseData();
-        resultData.setCode(200);
-        resultData.setMessage("查询详情成功");
-        //递归查询组织相关配置数据
-        resultData.setData(deptPermissionService.selectDeptPermission(deptId));
-        return resultData;
-    }
-
-    /**
-     * 组织业务支持配置详情
-     */
-    @RequestMapping(value = "/detail/{deptPermissionId}")
-    @ResponseBody
-    public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) {
-        return ResponseData.success(deptPermissionService.getById(deptPermissionId));
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..61e20d5
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,74 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/simManage")
+public class DeviceImeiController extends BaseController {
+
+    private final IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listPage")
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchImport")
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index bb9abb6..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
@@ -54,10 +53,10 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String modelName, String communication) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName)
+                .like("MODEL_NAME", deviceType == null ? "" : deviceType)
                 .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
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 e9bb4c8..9232bbf 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
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,18 +50,13 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        responseData.setData(super.packForBT(page));
+        return responseData;
     }
 
     /**
@@ -137,4 +133,5 @@
     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/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..136d858
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..a47b0c7
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
+          TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,
+        <include refid="dateTime_toChar">
+            <property name="paramTime" value="logtime"/>
+        </include>
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index c1516f3..7de589e 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT
+        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -127,13 +127,13 @@
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="beginTime"/>
+                <property name="paramTime" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
             <include refid="dateTime_toChar">
-                <property name="paramTime" value="endTime"/>
+                <property name="paramTime" value="#{endTime}"/>
             </include>
         </if>
         <if test="keywords != null and keywords !=''">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..9544f57
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    private String devcode;
+
+    private String imei;
+
+    private String iccid;
+
+    private Date logtime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..4c1f526
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IDeviceImeiService {
+
+    ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
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 cbb7ac1..3037648 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
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +29,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+    ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..67bde2c
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,183 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public ResponseData deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
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 067a044..57d324f 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
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public ResponseData listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index c3b382a..35ef9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -23,16 +23,16 @@
      * 序号
      */
     private Long id;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("井名称")
+    @ExcelProperty("点位名称")
     private String wellName;
     @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("井类型")
+    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 34c1772..b43c3d8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -48,7 +48,7 @@
      */
 
     private Long id;//主键
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 0aa4846..e521ddc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -26,7 +26,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 84ae05d..3335181 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 0ce5716..c70230c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -23,7 +23,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index e86142c..e6fb9bc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -12,7 +12,6 @@
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
-
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("设备类型")
@@ -23,11 +22,10 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 4b9f355..67ce1de 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -22,7 +22,7 @@
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 06d5578..05e47c0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -37,7 +37,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
index 140d1b8..9f52e1b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
@@ -26,7 +26,7 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 指标名称
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..673594d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -42,6 +42,7 @@
      * 是否有效
      */
     @TableField("VALID")
+
     private String valid;
     /**
      * 监控内容
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
new file mode 100644
index 0000000..a399ba5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -0,0 +1,54 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/deptPermission")
+public class DeptPermissionController extends BaseController {
+
+    private final DeptPermissionConfigService deptPermissionService;
+
+    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
+        this.deptPermissionService = deptPermissionService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object deviceDeptPermissionList(String deptid) {
+        return deptPermissionService.deviceDeptPermissionList(deptid);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.addDeptPermission(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
+        return deptPermissionService.editDeptPermission(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteDeptPermission(@PathVariable("id") Long id) {
+        return deptPermissionService.deleteDeptPermission(id);
+    }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
new file mode 100644
index 0000000..8c9134e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
+
+    List<Map<String, Object>> getListPage(@Param("deptid") String deptid);
+
+    String getPid();
+
+    String getDeviceName(@Param("deviceType") String deviceType);
+
+    String getWellName(@Param("pid") String pid, @Param("wellType") String wellType);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
new file mode 100644
index 0000000..09de430
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeptPermissionConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.TenantDept">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <select id="getListPage" resultType="MAP">
+        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        FROM config_dept_permission
+        WHERE 1=1
+        <if test="deptid != null and deptid !=''">
+            AND DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="getPid" resultType="String">
+       SELECT ID
+	   FROM sys_dict
+	   WHERE  code="sluicewellType"
+    </select>
+
+    <select id="getDeviceName" resultType="String">
+        SELECT TYPE_NAME
+        FROM   base_device_type
+        WHERE id=#{deviceType}
+    </select>
+
+    <select id="getWellName" resultType="String">
+       SELECT NAME
+	   FROM sys_dict
+	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
+    </select>
+
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
new file mode 100644
index 0000000..60515e6
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.DeptPermission;
+
+public interface DeptPermissionConfigService {
+
+    ResponseData deviceDeptPermissionList(String deptid);
+
+    Object addDeptPermission(DeptPermission deviceImei);
+
+    Object editDeptPermission(DeptPermission deviceImei);
+
+    Object deleteDeptPermission(Long id);
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
new file mode 100644
index 0000000..434fc20
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
+import com.casic.missiles.modular.system.model.DeptPermission;
+import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
+
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(deptList);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object addDeptPermission(DeptPermission deptPermission) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deptPermission);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}",
+                    deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object editDeptPermission(DeptPermission deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    public Object deleteDeptPermission(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    private void supplementData(List<Map<String, Object>> deptList) {
+        deptList.forEach(
+                dept -> {
+                    dept.put("deptName", permissionService.getDeptService().getDeptName(dept.get("deptid").toString()));
+
+                    dept.put("wellTypeName", getWellTypeList(dept.get("wellType").toString()));
+                    dept.put("wellType", JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("deviceTypeName", getDevcieTypeList(dept.get("deviceType").toString()));
+                    dept.put("deviceType", JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                }
+        );
+    }
+
+    private String getWellTypeList(String wellTypes) {
+        String pid = this.baseMapper.getPid();
+        StringBuffer wellTypeNames = new StringBuffer();
+        for (Object wellType : JSON.parseObject(wellTypes, List.class)) {
+            wellTypeNames.append(this.baseMapper.getWellName(pid, wellType.toString()) + ",");
+        }
+        wellTypeNames.deleteCharAt(wellTypeNames.length() - 1);
+        return wellTypeNames.toString();
+    }
+
+    private String getDevcieTypeList(String devcieTypes) {
+        StringBuffer devcieTypeNames = new StringBuffer();
+        for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
+            devcieTypeNames.append(this.baseMapper.getDeviceName(devcieType.toString()) + ",");
+        }
+        devcieTypeNames.deleteCharAt(devcieTypeNames.length() - 1);
+        return devcieTypeNames.toString();
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 3a8c3f7..633ee7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..401b722 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 8402675..0e0012f 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
index f118688..19af71a 100644
--- a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
index 9145a70..adfdd00 100644
--- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
Binary files differ