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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.update(alarmContentType);
+
+    }
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }

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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}
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 4422788..728842c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.springframework.stereotype.Service;
 
+import java.nio.channels.AcceptPendingException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +38,58 @@
     public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
         return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
     }
+
+
+    @Override
+    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
+        return this.baseMapper.selectByID(Id,dataScope);
+    }
+
+    @Override
+    public ResponseData deleteById(Long Id) {
+        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",Id);
+        boolean flag = this.remove(wrapper);
+        if(flag == true){
+            ResponseData responseData=new ResponseData();
+            responseData.setCode(200);
+            responseData.setMessage("success");
+            return responseData;
+        }
+        else{
+            return ResponseData.error("数据不存在");
+        }
+
+    }
+
+    @Override
+    public ResponseData add(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.save(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+
+    }
+
+    @Override
+    public ResponseData update(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.updateById(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
+            return ResponseData.error("更新异常");
+        }
+
+    }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}
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 4422788..728842c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.springframework.stereotype.Service;
 
+import java.nio.channels.AcceptPendingException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +38,58 @@
     public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
         return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
     }
+
+
+    @Override
+    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
+        return this.baseMapper.selectByID(Id,dataScope);
+    }
+
+    @Override
+    public ResponseData deleteById(Long Id) {
+        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",Id);
+        boolean flag = this.remove(wrapper);
+        if(flag == true){
+            ResponseData responseData=new ResponseData();
+            responseData.setCode(200);
+            responseData.setMessage("success");
+            return responseData;
+        }
+        else{
+            return ResponseData.error("数据不存在");
+        }
+
+    }
+
+    @Override
+    public ResponseData add(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.save(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+
+    }
+
+    @Override
+    public ResponseData update(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.updateById(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
+            return ResponseData.error("更新异常");
+        }
+
+    }
+
 }
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
new file mode 100644
index 0000000..1b54b38
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 123
+ * @since 2019-10-15
+ */
+public interface AlarmContentTypeMapper extends BaseMapper<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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}
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 4422788..728842c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.springframework.stereotype.Service;
 
+import java.nio.channels.AcceptPendingException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +38,58 @@
     public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
         return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
     }
+
+
+    @Override
+    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
+        return this.baseMapper.selectByID(Id,dataScope);
+    }
+
+    @Override
+    public ResponseData deleteById(Long Id) {
+        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",Id);
+        boolean flag = this.remove(wrapper);
+        if(flag == true){
+            ResponseData responseData=new ResponseData();
+            responseData.setCode(200);
+            responseData.setMessage("success");
+            return responseData;
+        }
+        else{
+            return ResponseData.error("数据不存在");
+        }
+
+    }
+
+    @Override
+    public ResponseData add(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.save(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+
+    }
+
+    @Override
+    public ResponseData update(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.updateById(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
+            return ResponseData.error("更新异常");
+        }
+
+    }
+
 }
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
new file mode 100644
index 0000000..1b54b38
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 123
+ * @since 2019-10-15
+ */
+public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 541c602..d7f0da5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
+    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
 }

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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}
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 4422788..728842c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.springframework.stereotype.Service;
 
+import java.nio.channels.AcceptPendingException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +38,58 @@
     public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
         return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
     }
+
+
+    @Override
+    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
+        return this.baseMapper.selectByID(Id,dataScope);
+    }
+
+    @Override
+    public ResponseData deleteById(Long Id) {
+        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",Id);
+        boolean flag = this.remove(wrapper);
+        if(flag == true){
+            ResponseData responseData=new ResponseData();
+            responseData.setCode(200);
+            responseData.setMessage("success");
+            return responseData;
+        }
+        else{
+            return ResponseData.error("数据不存在");
+        }
+
+    }
+
+    @Override
+    public ResponseData add(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.save(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+
+    }
+
+    @Override
+    public ResponseData update(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.updateById(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
+            return ResponseData.error("更新异常");
+        }
+
+    }
+
 }
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
new file mode 100644
index 0000000..1b54b38
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 123
+ * @since 2019-10-15
+ */
+public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 541c602..d7f0da5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
+    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index e33c2c2..f513a60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -48,4 +48,11 @@
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
     </select>
 
+    <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM `alarm_level`
+        WHERE ID = #{id}
+    </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 1f65166..b183bfa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -3,23 +3,28 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.model.AlarmLevel;
+import com.casic.missiles.modular.system.model.BusNbDevice;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.channels.AcceptPendingException;
 import java.util.*;
 
 
@@ -29,6 +34,7 @@
  * @author dev
  * @Date 2019-10-15 17:00:34
  */
+@Slf4j
 @Controller
 @RequestMapping("/alarm")
 public class AlarmLevelController extends BaseController {
@@ -39,6 +45,8 @@
     private AbstractPermissionContext permissionService;
     @Resource
     private IDeptPermissionService deptPermissionService;
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
     /**
      * 获取告警等级列表
@@ -128,6 +136,7 @@
             tenantId = Long.valueOf(currUser.getTenantId());
         }
         List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
 
@@ -160,4 +169,46 @@
         }
         return ResponseData.success();
     }
+
+
+    /**
+     * 获取详情信息
+     */
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectAlarmLevel(@PathVariable(name = "Id") Long ID) {
+        // 待定
+        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+        System.out.println("--------------------------------------------");
+        System.out.println(dataScope);
+        System.out.println("--------------------------------------------");
+        AlarmLevel alarmLevel= alarmLevelService.selectByID(ID,dataScope);
+        return ResponseData.success(alarmLevel);
+
+    }
+
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) {
+        return alarmLevelService.deleteById(id);
+    }
+
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmLevel alarmLevel) {
+        System.out.println(alarmLevel.toString());
+        return alarmLevelService.add(alarmLevel);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmLevel alarmLevel) {
+        return alarmLevelService.update(alarmLevel);
+
+    }
+
+
 }
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
new file mode 100644
index 0000000..8dff963
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.alarm.controller;
+
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import sun.misc.Contended;
+
+@Slf4j
+@Controller
+@RequestMapping("/alarmtype")
+public class AlarmTypeConfigController {
+    @Autowired
+    private IAlarmContentTypeService alarmContentTypeService;
+
+
+
+
+
+    @RequestMapping(value = "/detail/{id}")
+    @ResponseBody
+    public Object selectById(@PathVariable(name = "id") Long id){
+        return alarmContentTypeService.selectById(id);
+
+    }
+
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object delete(@PathVariable(name = "id") Long Id){
+        return alarmContentTypeService.deleteById(Id);
+
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @ResponseBody
+    public Object add(@RequestBody AlarmContentType alarmContentType){
+        return alarmContentTypeService.add(alarmContentType);
+
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody AlarmContentType alarmContentType){
+        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
new file mode 100644
index 0000000..0e6063f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+
+public interface IAlarmContentTypeService extends IService<AlarmContentType> {
+    ResponseData selectById(Long id);
+    ResponseData 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 d958acb..89e07f9 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
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 
 import java.util.List;
@@ -18,4 +20,8 @@
     Map<String,Object> selectByNameAndTenGroup(Long tenantId, String name);
     List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level);
+    AlarmLevel selectByID(Long id, DataScope dataScope);
+    ResponseData deleteById(Long id);
+    ResponseData add(AlarmLevel alarmLevel);
+    ResponseData update(AlarmLevel alarmLevel);
 }
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
new file mode 100644
index 0000000..6feabf6
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -0,0 +1,72 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
+import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.google.gson.internal.$Gson$Preconditions;
+import org.springframework.stereotype.Service;
+
+import java.nio.channels.AcceptPendingException;
+
+@Service
+public class AlarmContentTypeServiceImpl extends ServiceImpl<AlarmContentTypeMapper, AlarmContentType> implements IAlarmContentTypeService {
+    @Override
+    public ResponseData selectById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.getById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型查询异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData add(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.save(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型插入异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+
+    @Override
+    public ResponseData update(AlarmContentType AlarmContentType){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.updateById(AlarmContentType));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型更新异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+    @Override
+    public ResponseData deleteById(Long id){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData.setData(this.removeById(id));
+            responseData.setMessage("success");
+            responseData.setCode(200);
+            return responseData;
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警内容类型删除异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+    }
+}
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 4422788..728842c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.springframework.stereotype.Service;
 
+import java.nio.channels.AcceptPendingException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +38,58 @@
     public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
         return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
     }
+
+
+    @Override
+    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
+        return this.baseMapper.selectByID(Id,dataScope);
+    }
+
+    @Override
+    public ResponseData deleteById(Long Id) {
+        QueryWrapper<AlarmLevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",Id);
+        boolean flag = this.remove(wrapper);
+        if(flag == true){
+            ResponseData responseData=new ResponseData();
+            responseData.setCode(200);
+            responseData.setMessage("success");
+            return responseData;
+        }
+        else{
+            return ResponseData.error("数据不存在");
+        }
+
+    }
+
+    @Override
+    public ResponseData add(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.save(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置新增出现异常，异常信息{}",ex);
+            return ResponseData.error("插入异常");
+        }
+
+    }
+
+    @Override
+    public ResponseData update(AlarmLevel alarmLevel) {
+        ResponseData resultData = new ResponseData();
+        try {
+            this.updateById(alarmLevel);
+            resultData.setMessage("success");
+            return ResponseData.success();
+        }
+        catch (AcceptPendingException ex){
+            log.error("主题:报警等级配置更新出现异常，异常信息{}",ex);
+            return ResponseData.error("更新异常");
+        }
+
+    }
+
 }
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
new file mode 100644
index 0000000..1b54b38
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.model.AlarmContentType;
+import com.casic.missiles.modular.system.model.AlarmLevel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 123
+ * @since 2019-10-15
+ */
+public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 541c602..d7f0da5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
+    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index e33c2c2..f513a60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -48,4 +48,11 @@
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
     </select>
 
+    <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM `alarm_level`
+        WHERE ID = #{id}
+    </select>
+
 </mapper>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
new file mode 100644
index 0000000..3a91852
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@TableName("base_alarm_content_type")
+public class AlarmContentType extends Model<AlarmContentType> {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 告警内容类别
+     */
+    @TableField("ALARM_CONTENT")
+    private String alarmContent;
+    /**
+     * 告警类别
+     */
+    @TableField("ALARM_TYPE")
+    private Integer alarmType;
+    /**
+     * 设备类型ID
+     */
+    @TableField("DEVICE_TYPE")
+    private Integer deviceType;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAlarmContent() {
+        return alarmContent;
+    }
+
+    public void setAlarmContent(String alarmContent) {
+        this.alarmContent = alarmContent;
+    }
+
+    public Integer getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(Integer alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public Integer getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(Integer deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    @Override
+    public String toString() {
+        return "AlarmContentType{" +
+                "id=" + id +
+                ", alarmContent='" + alarmContent + '\'' +
+                ", alarmType=" + alarmType +
+                ", deviceType=" + deviceType +
+                '}';
+    }
+}