diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..f7f0a58
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IDeviceImeiService {
+
+    Object deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..f7f0a58
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IDeviceImeiService {
+
+    Object deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index cbb7ac1..88f7e55 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -1,9 +1,11 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+   Object  listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..f7f0a58
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IDeviceImeiService {
+
+    Object deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index cbb7ac1..88f7e55 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -1,9 +1,11 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+   Object  listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..a8583aa
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,181 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public Object deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!RegUtil.isNumOrLetter(deviceImeiList.get(i).getId().toString())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，smi必填且为数字");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//                    Device device = iDeviceService.getDeviceByDevCode(busConfigDTOList.get(i).getDevcode());
+//                    if (null == device) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+//        stringMap.put("success", true);
+//        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..f7f0a58
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IDeviceImeiService {
+
+    Object deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index cbb7ac1..88f7e55 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -1,9 +1,11 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+   Object  listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..a8583aa
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,181 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public Object deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!RegUtil.isNumOrLetter(deviceImeiList.get(i).getId().toString())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，smi必填且为数字");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//                    Device device = iDeviceService.getDeviceByDevCode(busConfigDTOList.get(i).getDevcode());
+//                    if (null == device) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+//        stringMap.put("success", true);
+//        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
index 067a044..ca50dc2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public Object listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 86e00d5..6fb1684 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -79,7 +79,7 @@
     }
 
     private void alarmRuleWrapper(Map<String, Object> map) {
-        String deviceType = map.get("deviceType")==null?"":map.get("deviceType").toString();
+        String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
@@ -87,10 +87,8 @@
 
     @RequestMapping(value = "/update")
     @ResponseBody
-    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateRule(@RequestParam(value = "id", required = true) Long id, HttpServletRequest httpServletRequest) {
         Map<String, Object> retMap = new HashMap<>();
-        //datascope
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         if (super.getSession().getAttribute("sessionFlag") == null) {
             retMap.put("code", 505);
             retMap.put("message", "sessionExpired");
@@ -160,12 +158,11 @@
      */
     @RequestMapping(value = "/getNoAlarmDevice")
     @ResponseBody
-    public Map<String, Object> getNoAlarmDevice() {
-
+    public Map<String, Object> getNoAlarmDevice(String devcode) {
         Map<String, Object> retMap = new HashMap<>();
         //datascope
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope);
+        List<AlarmRuleDTO> alarmRuleList = alarmRuleService.getNoAlarmDevice(dataScope,devcode);
         retMap.put("code", 200);
         retMap.put("message", "success");
         retMap.put("data", alarmRuleList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 4df8e53..15b32d4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -20,7 +20,7 @@
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(Page<Map<String, Object>> page, String keywords, String deviceType, DataScope dataScope);
-    boolean updateRule( int id, float highValue, float lowValue);
-    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope);
+    boolean updateRule( Long id, float highValue, float lowValue);
+    List<AlarmRuleDTO>  getNoAlarmDevice(DataScope dataScope,String devcode);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 55c4d17..02e874c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -32,12 +32,12 @@
     }
 
     @Override
-    public boolean updateRule(int id, float highValue, float lowValue) {
+    public boolean updateRule(Long id, float highValue, float lowValue) {
         return this.baseMapper.updateRule(id,highValue,lowValue);
     }
 
     @Override
-    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope) {
-        return this.baseMapper.getNoAlarmDevice(dataScope);
+    public List<AlarmRuleDTO> getNoAlarmDevice(DataScope dataScope,String devcode) {
+        return this.baseMapper.getNoAlarmDevice(dataScope,devcode);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 265ca2f..964d374 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -21,6 +21,6 @@
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
     List<Map<String,Object>> ruleListViaParam(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope);
-    boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
-    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope);
+    boolean updateRule(@Param("id") Long id,@Param("highValue") float highValue,@Param("lowValue") float lowValue);
+    List<AlarmRuleDTO> getNoAlarmDevice(@Param("dataScope") DataScope dataScope,@Param("devcode")String  devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index a7d45a7..0646d41 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -82,6 +82,7 @@
         </if>
         WHERE ID=#{id}
     </update>
+
     <select id="getNoAlarmDevice" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDTO">
        SELECT d.id AS id,d.DEVCODE AS devcode,d.deviceName AS "deviceName",
         d.deviceType AS "deviceType",
@@ -90,6 +91,13 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID='1' AND d.deviceType IN (2,6,8,10)
+        AND d.VALID='1' AND d.deviceType IN
+        (SELECT  ID
+         FROM  base_device_type
+         WHERE ALARM_RULE_TYPE='1')
+        <if test="devcode!='' and devcode!=null">
+            AND  DEVCODE= #{devcode}
+        </if>
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
new file mode 100644
index 0000000..4ad83f1
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @author cz
+ * @date 2022-7-8
+ */
+@RestController
+@RequestMapping("/device/sim")
+public class DeviceImeiController {
+
+
+    @Autowired
+    private IDeviceImeiService deviceImeiService;
+
+    public DeviceImeiController(IDeviceImeiService deviceImeiService) {
+        this.deviceImeiService = deviceImeiService;
+    }
+
+    /**
+     * 获取分页列表SMI
+     */
+    @RequestMapping(value = "/listpage")
+    @ResponseBody
+    public Object deviceImeiListPage(String devcode) {
+        //  devcode	否	string	设备编号
+        Page<DeviceImei> page = PageFactory.defaultPage();
+        return deviceImeiService.deviceImeiListPage(page, devcode);
+    }
+
+    /**
+     * 新增SMI
+     */
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object addImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.addImei(deviceImei);
+    }
+
+    /**
+     * 更新SMI
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object editImei(@RequestBody DeviceImei deviceImei) {
+        return deviceImeiService.editImei(deviceImei);
+    }
+
+    /**
+     * 删除imei
+     */
+    @RequestMapping(value = "/delete/{id}")
+    @ResponseBody
+    public Object deleteImei(@PathVariable("id") Long id) {
+        return deviceImeiService.deleteImei(id);
+    }
+
+    /**
+     * 批量导入SMI
+     */
+    @RequestMapping(value = "/batchimport")
+    @ResponseBody
+    public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
+        return deviceImeiService.importImeiList(uploadFile);
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
index 12a3907..f781cf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
@@ -13,6 +13,10 @@
 
 import java.util.Map;
 
+/**
+ * @author  cz
+ * @date   2022-07-06
+ */
 @RestController
 @RequestMapping("/tube")
 public class DeviceTubeController extends BaseController {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index e9bb4c8..6c30d9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备类型控制器
@@ -49,20 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String deviceType, String isValid) {
-        Page<DeviceType> page = PageFactory.defaultPage();
-        if (deviceType == null) {
-            deviceType = "";
-        }
-        if (isValid == null) {
-            isValid = "";
-        }
-        QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
-        page = deviceTypeService.page(page, query);
-        return new SuccessResponseData(super.packForBT(page));
+    public Object listPage(String typeName, String isValid) {
+        Page<Map<String,Object>> page = PageFactory.defaultPage();
+        typeName = typeName == null ? "" : typeName;
+        isValid = isValid == null ? "" : isValid;
+        return  deviceTypeService.listPage(page,typeName,isValid);
     }
-
     /**
      * 新增
      */
@@ -137,4 +130,5 @@
     public Object detail(@PathVariable("deviceTypeId") String deviceTypeId) {
         return ResponseData.success(deviceTypeService.getById(deviceTypeId));
     }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
new file mode 100644
index 0000000..e6fccd4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
+
+    List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
+                                              @Param("devcode") String devcode);
+
+
+
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
index a11ec0b..85522f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
@@ -1,10 +1,13 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +24,7 @@
      */
     int countDeviceByType(@Param("typeId") Serializable typeId);
 
+    List<Map<String,Object>> getlistPage(@Param("page") Page<Map<String,Object>> page, @Param("typeName") String typeName,
+                                 @Param("isValid") String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index df99f17..3851961 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -22,4 +22,20 @@
         where DEVICE_TYPE = #{typeId}
     </select>
 
+
+    <select id="getlistPage" resultType="MAP">
+        select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType",
+        VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue",
+        ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent",
+        TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig"
+        from base_device_type
+        WHERE 1=1
+        <if test="typeName != null and typeName !=''">
+            AND TYPE_NAME= #{typeName}
+        </if>
+        <if test="isValid != null and isValid !=''">
+            AND VALID = #{isValid}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
new file mode 100644
index 0000000..abd9048
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -0,0 +1,32 @@
+package com.casic.missiles.modular.system.model;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class DeviceImei extends Model<DeviceImei> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Smi主键 自增
+     */
+    @ExcelProperty("设备类型名称")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ExcelProperty("设备编号")
+    private Long deviceId;
+
+    @ExcelProperty("传感器Id")
+    private Long sensorId;
+
+    @ExcelProperty("设备类型名称")
+    private Long active;
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
new file mode 100644
index 0000000..f7f0a58
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IDeviceImeiService {
+
+    Object deviceImeiListPage(Page<DeviceImei> page, String devcode);
+
+    Object addImei(DeviceImei deviceImei);
+
+    Object editImei(DeviceImei deviceImei);
+
+    Object deleteImei(Long id);
+
+    Object importImeiList(MultipartFile uploadFile);
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
index cbb7ac1..88f7e55 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
@@ -1,9 +1,11 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,6 @@
 
     DeviceType selectDeviceTypeById(Long id);
 
+   Object  listPage(Page<Map<String,Object>> page, String typeName, String isValid);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
new file mode 100644
index 0000000..a8583aa
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -0,0 +1,181 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.model.response.ResponseData;;
+import com.casic.missiles.modular.system.dao.DeviceImeiMapper;
+import com.casic.missiles.modular.system.model.DeviceImei;
+import com.casic.missiles.modular.system.service.IDeviceImeiService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DeviceImeiService extends ServiceImpl<DeviceImeiMapper, DeviceImei> implements IDeviceImeiService {
+
+    @Resource
+    private IBaseExportService exportService;
+
+    @Override
+    public Object deviceImeiListPage(Page<DeviceImei> page, String devcode) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DeviceImei> pageList = this.baseMapper.getImeiListPage(page, devcode);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备编号{},异常信息为{}", devcode, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object addImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.insert(deviceImei);
+            responseData.setMessage("新增成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object editImei(DeviceImei deviceImei) {
+        ResponseData responseData = new ResponseData();
+        if (ObjectUtil.isEmpty(deviceImei.getId())) {
+            responseData.setMessage("主键不能为空");
+            responseData.setCode(200);
+        } else {
+            try {
+                this.baseMapper.updateById(deviceImei);
+                responseData.setMessage("更新成功");
+                responseData.setCode(200);
+            } catch (DataAccessException dex) {
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+                responseData.setCode(500);
+                responseData.setMessage("数据库异常");
+            }
+        }
+        return responseData;
+    }
+
+    @Override
+    public Object deleteImei(Long id) {
+        ResponseData responseData = new ResponseData();
+        try {
+            this.baseMapper.deleteById(id);
+            responseData.setMessage("删除成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：smi删除出现异常，主键id:{},异常信息为{}", id, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
+    public Object importImeiList(MultipartFile uploadFile) {
+        ResponseData responseData = new ResponseData();
+        if (null == uploadFile) {
+            responseData.setCode(500);
+            responseData.setMessage("上传失败，无法找到文件！");
+            return responseData;
+        }
+        try {
+            List<DeviceImei> deviceImeiList = exportService.importExcel(DeviceImei.class, uploadFile, null, null);
+            Map<String, Object> objectMap = this.validate(deviceImeiList);
+            //检验通过后写入
+            if ((Boolean) objectMap.get("success")) {
+                this.addBatchImei(deviceImeiList);
+                responseData.setCode(200);
+                responseData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                responseData.setCode(500);
+                responseData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("导入失败");
+        }
+        return responseData;
+    }
+
+    private void addBatchImei(List<DeviceImei> deviceImeiList) {
+        deviceImeiList.forEach(
+                deviceImei -> this.baseMapper.insert(deviceImei)
+        );
+    }
+
+    private Map<String, Object> validate(List<DeviceImei> deviceImeiList) {
+        Map<String, Object> stringMap = new HashMap<>();
+//        try {
+//            for (int i = 0; i < deviceImeiList.size(); i++) {
+//                if (!RegUtil.isNumOrLetter(deviceImeiList.get(i).getId().toString())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，smi必填且为数字");
+//                    return stringMap;
+//                } else {//校验设备编号是否在系统中存在
+//                    Device device = iDeviceService.getDeviceByDevCode(busConfigDTOList.get(i).getDevcode());
+//                    if (null == device) {
+//                        stringMap.put("success", false);
+//                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+//                        return stringMap;
+//                    } else {
+//                        deviceImeiList.get(i).setDeviceId(device.getId());
+//                    }
+//                }
+//                if (0 == deviceImeiList.get(i).getPercent()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getPercent()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//                if (!RegUtil.isInteger(deviceImeiList.get(i).getRetryTimes())) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+//                    return stringMap;
+//                }
+//                if (0.0 == deviceImeiList.get(i).getInstallHeight()) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                } else if (!RegUtil.isDecimal2(String.valueOf(deviceImeiList.get(i).getInstallHeight()))) {
+//                    stringMap.put("success", false);
+//                    stringMap.put("msg", "第" + (i + 2) + "行，安装高度必填且小数位最多保留2位");
+//                    return stringMap;
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            stringMap.put("success", false);
+//            stringMap.put("msg", "导入异常！");
+//        }
+//        stringMap.put("success", true);
+//        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+}
+
+
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
index 067a044..ca50dc2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
@@ -1,13 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeviceTypeMapper;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +24,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+@Slf4j
 @Service
 public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
 
@@ -37,4 +45,21 @@
         return this.baseMapper.selectById(id);
     }
 
+    @Override
+    public Object listPage(Page<Map<String,Object>> page, String typeName, String isValid) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String,Object>> pageList = this.baseMapper.getlistPage(page, typeName, isValid);
+            page.setRecords(pageList);
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+            responseData.setData(page);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询分页出现异常，设备类型名称{}，是否激活{},异常信息为{}", typeName, isValid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库异常");
+        }
+        return responseData;
+    }
+
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index ec5edf6..77cf504 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -31,47 +31,38 @@
     /**
      * 设备类型名称
      */
-    @TableField("TYPE_NAME")
     private String typeName;
     /**
      * 类型描述
      */
-    @TableField("TYPE_DESCRIPTION")
     private String typeDescription;
     /**
      * 是否有效
      */
-    @TableField("VALID")
     private String valid;
     /**
      * 监控内容
      */
-    @TableField("WATCH_TYPE")
     private String watchType;
     /**
      * 是否不需要绑定集中器
      */
-    @TableField("IS_NO_CONCENT")
     private String isNoConcent;
     /**
      * 报警规则类型 1需要单独设置报警规则，2统一的报警规则 3无报警规则
      */
-    @TableField("ALARM_RULE_TYPE")
     private String alarmRuleType;
     /**
      * 是否需要报警上限
      */
-    @TableField("ALARM_RULE_HIGHVALUE")
     private String alarmRuleHighvalue;
     /**
      * 是否需要报警下限
      */
-    @TableField("ALARM_RULE_LOWVALUE")
     private String alarmRuleLowvalue;
     /**
      * 数据展示配置，json串
      */
-    @TableField("DATA_CONFIG")
     private String dataConfig;
 
     @Override