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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**

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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());

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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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

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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">

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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
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
index 41644eb..a399ba5 100644
--- 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
@@ -1,10 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +21,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ResponseData responseData =  deptPermissionService.deviceDeptPermissionList(page, deptid);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return deptPermissionService.deviceDeptPermissionList(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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
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
index 41644eb..a399ba5 100644
--- 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
@@ -1,10 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +21,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ResponseData responseData =  deptPermissionService.deviceDeptPermissionList(page, deptid);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return deptPermissionService.deviceDeptPermissionList(deptid);
     }
 
     /**
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
index ea52c6d..8c9134e 100644
--- 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
@@ -7,11 +7,16 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
 
-    List<DeptPermission> getListPage(@Param("page") Page<DeptPermission> page,
-                                     @Param("deptid") String deptid);
+    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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
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
index 41644eb..a399ba5 100644
--- 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
@@ -1,10 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +21,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ResponseData responseData =  deptPermissionService.deviceDeptPermissionList(page, deptid);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return deptPermissionService.deviceDeptPermissionList(deptid);
     }
 
     /**
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
index ea52c6d..8c9134e 100644
--- 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
@@ -7,11 +7,16 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
 
-    List<DeptPermission> getListPage(@Param("page") Page<DeptPermission> page,
-                                     @Param("deptid") String deptid);
+    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
index 70959cc..09de430 100644
--- 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
@@ -10,7 +10,7 @@
     </resultMap>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeptPermission">
+    <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
@@ -19,4 +19,22 @@
         </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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
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
index 41644eb..a399ba5 100644
--- 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
@@ -1,10 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +21,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ResponseData responseData =  deptPermissionService.deviceDeptPermissionList(page, deptid);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return deptPermissionService.deviceDeptPermissionList(deptid);
     }
 
     /**
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
index ea52c6d..8c9134e 100644
--- 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
@@ -7,11 +7,16 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
 
-    List<DeptPermission> getListPage(@Param("page") Page<DeptPermission> page,
-                                     @Param("deptid") String deptid);
+    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
index 70959cc..09de430 100644
--- 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
@@ -10,7 +10,7 @@
     </resultMap>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeptPermission">
+    <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
@@ -19,4 +19,22 @@
         </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
index 59ead3f..60515e6 100644
--- 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
@@ -6,7 +6,7 @@
 
 public interface DeptPermissionConfigService {
 
-    ResponseData deviceDeptPermissionList(Page<DeptPermission> page, String deptid);
+    ResponseData deviceDeptPermissionList(String deptid);
 
     Object addDeptPermission(DeptPermission deviceImei);
 

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 feae987..c5a2140 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
@@ -141,7 +141,6 @@
 
     @RequestMapping("/configLevel")
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object configLevel(@RequestBody List<AlarmLevel> levelList) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
@@ -172,15 +171,14 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional(rollbackFor = Exception.class)
     public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
     @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);
     }
 
     /**
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 80104a0..67a04a0 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,5 +1,6 @@
 package com.casic.missiles.modular.alarm.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Contended;
 
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -24,10 +26,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object selectListPage(String alarmType, String deviceType, String alarmContent) {
-        Page<AlarmContentType> page = PageFactory.defaultPage();
-        ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return alarmContentTypeService.selectListPage(alarmType, deviceType, alarmContent);
     }
 
     @RequestMapping(value = "/delete/{id}")
@@ -50,5 +49,4 @@
         return alarmContentTypeService.update(alarmContentType);
     }
 
-
 }
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 2caeb3f..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,15 +1,15 @@
 package com.casic.missiles.modular.alarm.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 selectListPage(Page<AlarmContentType> page,String alarmType,String deviceType,String alarmContent);;
+    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 6ff7bdd..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
@@ -11,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 deleteByCondition(String deviceType, String name, String tenantId);
+
     ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
-    ResponseData updateAlarmLevel(AlarmLevel alarmLevel);
+
+    ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
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 291d448..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,7 +1,8 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -9,17 +10,20 @@
 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 selectListPage(Page<AlarmContentType> page, String alarmType, String deviceType, String alarmContent) {
+    public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent));
-            responseData.setData(page);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            supplementData(alarmContentTypeList);
+            responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
             responseData.setCode(200);
         } catch (AcceptPendingException ex) {
@@ -71,4 +75,13 @@
             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 ce0058d..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
@@ -13,6 +13,7 @@
 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;
@@ -54,8 +55,8 @@
     public ResponseData deleteByCondition(String deviceType, String name, String tenantId) {
         ResponseData responseData = new ResponseData();
         try {
-            Long  deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType);
-            Long  tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId);
+            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);
@@ -68,10 +69,11 @@
     }
 
     @Override
+    @Transactional
     public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
         ResponseData resultData = new ResponseData();
         try {
-            addAlarmLevelList(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevelParam);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -83,10 +85,11 @@
     }
 
     @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();
@@ -97,7 +100,12 @@
         return ResponseData.error("更新异常");
     }
 
-    private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException {
+    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());
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 d53597f..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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,9 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<AlarmContentType> selectListPage(@Param("page") Page<AlarmContentType> page,
-                                          @Param("alarmType") String alarmType,
-                                          @Param("deviceType") String deviceType,
-                                          @Param("alarmContent") String alarmContent);
+    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/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
index 23efd22..c8c28f7 100644
--- 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
@@ -13,7 +13,7 @@
         CONCAT('%',#{alarmContent},'%')
     </sql>
 
-    <select id="selectListPage" resultType="com.casic.missiles.modular.system.model.AlarmContentType">
+    <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
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
index 444d468..a47b0c7 100644
--- 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
@@ -7,8 +7,23 @@
         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,logtime
+        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 !=''">
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 011d02f..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
@@ -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-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 5d4229a..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("设备类型")
@@ -27,7 +26,6 @@
     private String wellCode;
     @ExcelProperty("状态描述")
     private String descn;
-
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("温度")
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
index 41644eb..a399ba5 100644
--- 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
@@ -1,10 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +21,7 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
-        Page<DeptPermission> page = PageFactory.defaultPage();
-        ResponseData responseData =  deptPermissionService.deviceDeptPermissionList(page, deptid);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return deptPermissionService.deviceDeptPermissionList(deptid);
     }
 
     /**
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
index ea52c6d..8c9134e 100644
--- 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
@@ -7,11 +7,16 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeptPermissionConfigDao extends BaseMapper<DeptPermission> {
 
-    List<DeptPermission> getListPage(@Param("page") Page<DeptPermission> page,
-                                     @Param("deptid") String deptid);
+    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
index 70959cc..09de430 100644
--- 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
@@ -10,7 +10,7 @@
     </resultMap>
 
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeptPermission">
+    <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
@@ -19,4 +19,22 @@
         </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
index 59ead3f..60515e6 100644
--- 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
@@ -6,7 +6,7 @@
 
 public interface DeptPermissionConfigService {
 
-    ResponseData deviceDeptPermissionList(Page<DeptPermission> page, String deptid);
+    ResponseData deviceDeptPermissionList(String deptid);
 
     Object addDeptPermission(DeptPermission deviceImei);
 
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
index f7640e8..434fc20 100644
--- 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
@@ -1,30 +1,43 @@
 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 {
 
-    public ResponseData deviceDeptPermissionList(Page<DeptPermission> page, String deptid) {
+    private final AbstractPermissionContext permissionService;
+
+    public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
+        this.permissionService = permissionService;
+    }
+
+    public ResponseData deviceDeptPermissionList(String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<DeptPermission> pageList = this.baseMapper.getListPage(page, deptid);
-            page.setRecords(pageList);
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(deptid);
+            this.supplementData(deptList);
             responseData.setMessage("查询成功");
             responseData.setCode(200);
-            responseData.setData(page);
+            responseData.setData(deptList);
         } catch (DataAccessException dex) {
             log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex);
             responseData.setCode(500);
@@ -81,4 +94,36 @@
         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();
+    }
+
 }