diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index bf9a8ab..a624767 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -173,9 +173,10 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo") ||
+                    key.contains("handleJobPerson") || key.contains("confirmJobPerson")) {
                 Object object = map.get(key);
-                if (object != null) {
+                if (!ObjectUtil.isEmpty(object)) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
                     map.replace(key, newVal);
                 }
@@ -394,7 +395,7 @@
         jobExcelDto.setJobCode(alarmExp.get("id").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
-        jobExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         jobExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString());
         jobExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString());
         jobExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index bf9a8ab..a624767 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -173,9 +173,10 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo") ||
+                    key.contains("handleJobPerson") || key.contains("confirmJobPerson")) {
                 Object object = map.get(key);
-                if (object != null) {
+                if (!ObjectUtil.isEmpty(object)) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
                     map.replace(key, newVal);
                 }
@@ -394,7 +395,7 @@
         jobExcelDto.setJobCode(alarmExp.get("id").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
-        jobExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         jobExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString());
         jobExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString());
         jobExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
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 171c917..014c645 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
@@ -77,17 +77,6 @@
         TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-    <sql id="offline_sum" databaseId="mysql">
-      ifnull(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
-
-    <sql id="offline_sum" databaseId="pgsql">
-         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE=${numberStatus} THEN 1 ELSE 0 END))
-    </sql>
-
-    <sql id="offline_sum" databaseId="oracle">
-        COALESCE(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
 
     <sql id="isNull_sum" databaseId="mysql">
        ifnull(SUM(IF(job_status=${numberStatus},1,0)),0)
@@ -116,31 +105,24 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'1'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         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
+        LEFT JOIN bus_device_status bds ON  bds.DEVICE_ID=BD.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>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index bf9a8ab..a624767 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -173,9 +173,10 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo") ||
+                    key.contains("handleJobPerson") || key.contains("confirmJobPerson")) {
                 Object object = map.get(key);
-                if (object != null) {
+                if (!ObjectUtil.isEmpty(object)) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
                     map.replace(key, newVal);
                 }
@@ -394,7 +395,7 @@
         jobExcelDto.setJobCode(alarmExp.get("id").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
-        jobExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         jobExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString());
         jobExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString());
         jobExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
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 171c917..014c645 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
@@ -77,17 +77,6 @@
         TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-    <sql id="offline_sum" databaseId="mysql">
-      ifnull(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
-
-    <sql id="offline_sum" databaseId="pgsql">
-         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE=${numberStatus} THEN 1 ELSE 0 END))
-    </sql>
-
-    <sql id="offline_sum" databaseId="oracle">
-        COALESCE(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
 
     <sql id="isNull_sum" databaseId="mysql">
        ifnull(SUM(IF(job_status=${numberStatus},1,0)),0)
@@ -116,31 +105,24 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'1'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         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
+        LEFT JOIN bus_device_status bds ON  bds.DEVICE_ID=BD.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>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index da250a4..30709aa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -113,7 +113,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view  dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -121,8 +122,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -150,7 +154,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -158,8 +163,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -193,14 +201,16 @@
                deptid,
                wellCode,
                POSITION,
-               onlineState,
+               CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
+
         WHERE valid = '1'
     </select>
 
@@ -215,29 +225,30 @@
                deptName,
                wellCode,
                POSITION as position,
-               onlineState,
+              CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
         WHERE valid = '1'
           and id = #{id}
         limit 1
     </select>
 
     <sql id="DeviceInWellInfo_Column_List">
-        d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName"
+         d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",t.TYPE_NAME AS "typeName"
     </sql>
 
     <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
         SELECT
         <include refid="DeviceInWellInfo_Column_List"/>
         FROM bus_device d
-        LEFT OUTER JOIN base_device_type t
-        ON d.DEVICE_TYPE = t.ID
+        LEFT OUTER JOIN base_device_type t ON d.DEVICE_TYPE = t.ID
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
         SELECT dw.DEVICE_ID
@@ -250,11 +261,12 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT dv.devcode as devcode, bdt.TYPE_NAME as "deviceTypeName",dv.devicetype,wellcode,dv.lasttime as lasttime,timestampdiff(DAY,dv.LASTTIME,now()) as offlineDays
         FROM   device_view  dv,base_device_type  bdt
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID,
         WHERE    dv.deviceType=bdt.ID
         <if test="deviceType != null and deviceType !=''">
             AND  dv.deviceType= #{deviceType}
         </if>
-        AND dv.onlineState='0'
+        AND bds.ONLINE_STATE='0'
         <if test="deviceCode != null and deviceCode !=''">
         AND  DEVCODE = #{deviceCode}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index bf9a8ab..a624767 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -173,9 +173,10 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo") ||
+                    key.contains("handleJobPerson") || key.contains("confirmJobPerson")) {
                 Object object = map.get(key);
-                if (object != null) {
+                if (!ObjectUtil.isEmpty(object)) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
                     map.replace(key, newVal);
                 }
@@ -394,7 +395,7 @@
         jobExcelDto.setJobCode(alarmExp.get("id").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
-        jobExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         jobExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString());
         jobExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString());
         jobExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
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 171c917..014c645 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
@@ -77,17 +77,6 @@
         TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-    <sql id="offline_sum" databaseId="mysql">
-      ifnull(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
-
-    <sql id="offline_sum" databaseId="pgsql">
-         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE=${numberStatus} THEN 1 ELSE 0 END))
-    </sql>
-
-    <sql id="offline_sum" databaseId="oracle">
-        COALESCE(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
 
     <sql id="isNull_sum" databaseId="mysql">
        ifnull(SUM(IF(job_status=${numberStatus},1,0)),0)
@@ -116,31 +105,24 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'1'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         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
+        LEFT JOIN bus_device_status bds ON  bds.DEVICE_ID=BD.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>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index da250a4..30709aa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -113,7 +113,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view  dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -121,8 +122,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -150,7 +154,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -158,8 +163,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -193,14 +201,16 @@
                deptid,
                wellCode,
                POSITION,
-               onlineState,
+               CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
+
         WHERE valid = '1'
     </select>
 
@@ -215,29 +225,30 @@
                deptName,
                wellCode,
                POSITION as position,
-               onlineState,
+              CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
         WHERE valid = '1'
           and id = #{id}
         limit 1
     </select>
 
     <sql id="DeviceInWellInfo_Column_List">
-        d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName"
+         d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",t.TYPE_NAME AS "typeName"
     </sql>
 
     <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
         SELECT
         <include refid="DeviceInWellInfo_Column_List"/>
         FROM bus_device d
-        LEFT OUTER JOIN base_device_type t
-        ON d.DEVICE_TYPE = t.ID
+        LEFT OUTER JOIN base_device_type t ON d.DEVICE_TYPE = t.ID
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
         SELECT dw.DEVICE_ID
@@ -250,11 +261,12 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT dv.devcode as devcode, bdt.TYPE_NAME as "deviceTypeName",dv.devicetype,wellcode,dv.lasttime as lasttime,timestampdiff(DAY,dv.LASTTIME,now()) as offlineDays
         FROM   device_view  dv,base_device_type  bdt
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID,
         WHERE    dv.deviceType=bdt.ID
         <if test="deviceType != null and deviceType !=''">
             AND  dv.deviceType= #{deviceType}
         </if>
-        AND dv.onlineState='0'
+        AND bds.ONLINE_STATE='0'
         <if test="deviceCode != null and deviceCode !=''">
         AND  DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
index 5e6c88d..6ef7627 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
@@ -139,12 +139,14 @@
         "stregnth",
         <include refid="date_toChar">
             <property name="paramTime" value="UPTIME"/>
-        </include>  AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE AS "onlineState",
+        </include>  AS uptime ,pci,rsrp,snr,
+        CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
         LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME AS "deviceName",bwi.WELL_FLAG_1 AS "groupId"
         FROM data_tube dt,
         bus_well_info bwi,
         bus_device_well bdw,
         bus_device bd
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=bd.ID
         WHERE dt.id=#{id}
         AND bdw.WELL_ID=bwi.ID
         AND bdw.DEVICE_ID = bd.ID

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index bf9a8ab..a624767 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -173,9 +173,10 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo") ||
+                    key.contains("handleJobPerson") || key.contains("confirmJobPerson")) {
                 Object object = map.get(key);
-                if (object != null) {
+                if (!ObjectUtil.isEmpty(object)) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
                     map.replace(key, newVal);
                 }
@@ -394,7 +395,7 @@
         jobExcelDto.setJobCode(alarmExp.get("id").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
-        jobExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString());
+        jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
         jobExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString());
         jobExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString());
         jobExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString());
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 171c917..014c645 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
@@ -77,17 +77,6 @@
         TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-    <sql id="offline_sum" databaseId="mysql">
-      ifnull(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
-
-    <sql id="offline_sum" databaseId="pgsql">
-         COALESCE(SUM(CASE WHEN BD.ONLINE_STATE=${numberStatus} THEN 1 ELSE 0 END))
-    </sql>
-
-    <sql id="offline_sum" databaseId="oracle">
-        COALESCE(SUM(IF(BD.ONLINE_STATE=${numberStatus},1,0)),0)
-    </sql>
 
     <sql id="isNull_sum" databaseId="mysql">
        ifnull(SUM(IF(job_status=${numberStatus},1,0)),0)
@@ -116,31 +105,24 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'1'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         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
+        LEFT JOIN bus_device_status bds ON  bds.DEVICE_ID=BD.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>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
         AS online,
-        <include refid="offline_sum">
-            <property name="numberStatus" value="'0'"/>
-        </include>
+        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total,bdt.TYPE_NAME AS "typeName"
         FROM
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index da250a4..30709aa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -113,7 +113,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view  dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -121,8 +122,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -150,7 +154,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view
+        FROM device_view dv
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
@@ -158,8 +163,11 @@
         <if test="deptid != null and deptid !=''">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !=''">
-            and onlineState = #{isOnline}
+        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+            and bds.ONLINE_STATE ='0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -193,14 +201,16 @@
                deptid,
                wellCode,
                POSITION,
-               onlineState,
+               CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
+
         WHERE valid = '1'
     </select>
 
@@ -215,29 +225,30 @@
                deptName,
                wellCode,
                POSITION as position,
-               onlineState,
+              CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
                lngBaidu,
                latGaode,
                lngGaode
-        FROM device_overview_view
+        FROM device_overview_view  dov
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dov.ID
         WHERE valid = '1'
           and id = #{id}
         limit 1
     </select>
 
     <sql id="DeviceInWellInfo_Column_List">
-        d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName"
+         d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",t.TYPE_NAME AS "typeName"
     </sql>
 
     <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
         SELECT
         <include refid="DeviceInWellInfo_Column_List"/>
         FROM bus_device d
-        LEFT OUTER JOIN base_device_type t
-        ON d.DEVICE_TYPE = t.ID
+        LEFT OUTER JOIN base_device_type t ON d.DEVICE_TYPE = t.ID
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
         SELECT dw.DEVICE_ID
@@ -250,11 +261,12 @@
     <select id="offlineListPage" resultType="MAP">
         SELECT dv.devcode as devcode, bdt.TYPE_NAME as "deviceTypeName",dv.devicetype,wellcode,dv.lasttime as lasttime,timestampdiff(DAY,dv.LASTTIME,now()) as offlineDays
         FROM   device_view  dv,base_device_type  bdt
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID,
         WHERE    dv.deviceType=bdt.ID
         <if test="deviceType != null and deviceType !=''">
             AND  dv.deviceType= #{deviceType}
         </if>
-        AND dv.onlineState='0'
+        AND bds.ONLINE_STATE='0'
         <if test="deviceCode != null and deviceCode !=''">
         AND  DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
index 5e6c88d..6ef7627 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
@@ -139,12 +139,14 @@
         "stregnth",
         <include refid="date_toChar">
             <property name="paramTime" value="UPTIME"/>
-        </include>  AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE AS "onlineState",
+        </include>  AS uptime ,pci,rsrp,snr,
+        CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState",
         LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME AS "deviceName",bwi.WELL_FLAG_1 AS "groupId"
         FROM data_tube dt,
         bus_well_info bwi,
         bus_device_well bdw,
         bus_device bd
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=bd.ID
         WHERE dt.id=#{id}
         AND bdw.WELL_ID=bwi.ID
         AND bdw.DEVICE_ID = bd.ID
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 916cffd..8c58c7d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -100,7 +100,7 @@
 
     <sql id="WatchData_Column_List">
         d.ID  AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",
-         ONLINE_STATE AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type
+        CASE WHEN 	bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END  AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
@@ -108,8 +108,8 @@
         SELECT
         <include refid="WatchData_Column_List"/>
         FROM bus_device d
-        LEFT OUTER JOIN base_device_type t
-        ON d.DEVICE_TYPE = t.ID
+        LEFT OUTER JOIN base_device_type t  ON d.DEVICE_TYPE = t.ID
+        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
         SELECT dw.DEVICE_ID