diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index a6220bd..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -117,6 +117,26 @@
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index a6220bd..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -117,6 +117,26 @@
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index aecc489..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,6 +17,9 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
     List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index a6220bd..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -117,6 +117,26 @@
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index aecc489..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,6 +17,9 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
     List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 4cf43f0..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -154,6 +154,7 @@
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -164,6 +165,24 @@
             <property name="numberStatus" value="'0'"/>
         </include>
         AS offline,
+        count(1) AS total
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+    </select>
+
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
         bus_device BD

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index a6220bd..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -117,6 +117,26 @@
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index aecc489..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,6 +17,9 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
     List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 4cf43f0..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -154,6 +154,7 @@
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -164,6 +165,24 @@
             <property name="numberStatus" value="'0'"/>
         </include>
         AS offline,
+        count(1) AS total
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+    </select>
+
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
         bus_device BD
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 0b5e37d..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -17,6 +17,8 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
     List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index c5a2140..d0d09c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -191,7 +190,6 @@
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
         return ResponseData.success(alarmLevel);
-
     }
 
     @RequestMapping(value = "/level/delete")
@@ -199,6 +197,4 @@
     public Object deleteAlarmLevel(String deviceType, String name, String tenantId) {
         return alarmLevelService.deleteByCondition(deviceType, name, tenantId);
     }
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 6fb1684..0a16aa8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -44,7 +44,6 @@
     @Autowired
     private IDeviceRuleService iDeviceRuleService;
 
-
     /**
      * 获取列表
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
index 67a04a0..3b24070 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
@@ -1,20 +1,12 @@
 package com.casic.missiles.modular.alarm.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService;
 import com.casic.missiles.modular.system.model.AlarmContentType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.Contended;
-
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index a6220bd..3689aa1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -117,6 +117,26 @@
     }
 
     /**
+     * 根据在线状态统计设备数量
+     */
+    @RequestMapping(value = "/deviceStaticsByStatusAndType")
+    @ResponseBody
+    public Object deviceStaticsByStatusAndType() {
+        ResponseData responseData = new ResponseData();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        try {
+            List<Map<String, Object>> res = statisticsService.deviceStaticsByStatusAndType(dataScope);
+            responseData.setData(res);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+            responseData.setCode(500);
+            responseData.setMessage("查询异常");
+        }
+        return responseData;
+    }
+    /**
      * 根据权属单位统计工单数
      */
     @RequestMapping(value = "/jobsByDept")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index aecc489..5583e9c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,6 +17,9 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(@Param("deptIds") String deptIds);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds);
+
+
     List<Map<String, Object>> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType);
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 4cf43f0..3601d60 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -154,6 +154,7 @@
         ]]>
     </sql>
 
+
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
         <include refid="offline_sum">
@@ -164,6 +165,24 @@
             <property name="numberStatus" value="'0'"/>
         </include>
         AS offline,
+        count(1) AS total
+        FROM
+        bus_device BD
+        LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
+        LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
+        WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+    </select>
+
+    <select id="deviceStaticsByStatusAndType" resultType="map">
+        SELECT
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'1'"/>
+        </include>
+        AS online,
+        <include refid="offline_sum">
+            <property name="numberStatus" value="'0'"/>
+        </include>
+        AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
         bus_device BD
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 0b5e37d..0db2e27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -17,6 +17,8 @@
 
     List<Map<String, Object>> deviceStaticsByStatus(DataScope dataScope);
 
+    List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope);
+
     List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
 
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 2655288..a75b472 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -77,6 +77,13 @@
     }
 
     @Override
+    public List<Map<String, Object>> deviceStaticsByStatusAndType(DataScope dataScope) {
+        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByStatusAndType(deptIds);
+        return mapList;
+    }
+
+    @Override
     public List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<Long> deptIds = dataScope.getDeptIds();