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 5aa9c8a..41ef398 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
@@ -228,6 +228,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 工单状态

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 5aa9c8a..41ef398 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
@@ -228,6 +228,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 工单状态
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 91b4bef..e27b0c1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,6 +127,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 告警值

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 5aa9c8a..41ef398 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
@@ -228,6 +228,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 工单状态
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 91b4bef..e27b0c1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,6 +127,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 告警值
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 d5f7d4f..bdd94ad 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
@@ -138,9 +138,9 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total
         FROM
@@ -153,9 +153,9 @@
 
     <select id="deviceStaticsByStatusAndType" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '1' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.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 5aa9c8a..41ef398 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
@@ -228,6 +228,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 工单状态
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 91b4bef..e27b0c1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,6 +127,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 告警值
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 d5f7d4f..bdd94ad 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
@@ -138,9 +138,9 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total
         FROM
@@ -153,9 +153,9 @@
 
     <select id="deviceStaticsByStatusAndType" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '1' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.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 a13b109..a4cc371 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
+        AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -113,8 +113,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view  dv
-        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
+        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}
@@ -126,7 +126,7 @@
             and bds.ONLINE_STATE ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+            and (bds.ONLINE_STATE ='1' or bds.ONLINE_STATE is null)
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -155,7 +155,7 @@
         SELECT
         <include refid="view_sql"/>
         FROM device_view dv
-        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
+        LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType != -1">
             and deviceType = #{deviceType}
@@ -240,7 +240,11 @@
     </select>
 
     <sql id="DeviceInWellInfo_Column_List">
-         d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN 	bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END  AS "onlineState",t.TYPE_NAME AS "typeName"
+        d.ID AS "deviceId", DEVCODE AS devcode,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALL_DATE"/>
+        </include>
+        AS "installDate",CASE WHEN d.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName"
     </sql>
 
     <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
@@ -248,13 +252,13 @@
         <include refid="DeviceInWellInfo_Column_List"/>
         FROM bus_device d
         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
+        LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
-            SELECT dw.DEVICE_ID
-            FROM bus_device_well dw
-            WHERE dw.WELL_ID = #{id}
-            AND dw.VALID='1'
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID='1'
         )
     </select>
 
@@ -278,10 +282,10 @@
         WHERE
         bds.online_State = '0'
         <if test="deviceCode != null and deviceCode !=''">
-            AND  bd.DEVCODE = #{deviceCode}
+            AND bd.DEVCODE = #{deviceCode}
         </if>
         <if test="deviceType != null and deviceType != -1">
-            AND  bd.device_type = #{deviceType}
+            AND bd.device_type = #{deviceType}
         </if>
     </select>
 

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 5aa9c8a..41ef398 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
@@ -228,6 +228,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 工单状态
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 91b4bef..e27b0c1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,6 +127,10 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
+            if ("燃气报警".equals(alarmContentName)) {
+                alarmValue += "%LEL";
+                map.replace("alarmValue", alarmValue);
+            }
         }
 
         // 告警值
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 d5f7d4f..bdd94ad 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
@@ -138,9 +138,9 @@
 
     <select id="deviceStaticsByStatus" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END))
         AS offline,
         count(1) AS total
         FROM
@@ -153,9 +153,9 @@
 
     <select id="deviceStaticsByStatusAndType" resultType="map">
         SELECT
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='1' OR  bds.ONLINE_STATE is NULL THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.ONLINE_STATE <![CDATA[ <> ]]> '1' THEN 1 ELSE 0 END))
         AS online,
-        COALESCE(SUM(CASE WHEN bds.ONLINE_STATE='0' THEN 1 ELSE 0 END))
+        COALESCE(SUM(CASE WHEN BD.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 a13b109..a4cc371 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
@@ -19,7 +19,7 @@
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE",INSTALL_HEIGHT  AS  "installHeight"
+        AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight"
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
@@ -113,8 +113,8 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         <include refid="view_sql"/>
-        FROM device_view  dv
-        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
+        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}
@@ -126,7 +126,7 @@
             and bds.ONLINE_STATE ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+            and (bds.ONLINE_STATE ='1' or bds.ONLINE_STATE is null)
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
@@ -155,7 +155,7 @@
         SELECT
         <include refid="view_sql"/>
         FROM device_view dv
-        LEFT JOIN  bus_device_status bds ON  bds.DEVICE_ID=dv.ID
+        LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID
         WHERE VALID = '1'
         <if test="deviceType != null and deviceType != -1">
             and deviceType = #{deviceType}
@@ -240,7 +240,11 @@
     </select>
 
     <sql id="DeviceInWellInfo_Column_List">
-         d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN 	bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END  AS "onlineState",t.TYPE_NAME AS "typeName"
+        d.ID AS "deviceId", DEVCODE AS devcode,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALL_DATE"/>
+        </include>
+        AS "installDate",CASE WHEN d.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName"
     </sql>
 
     <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
@@ -248,13 +252,13 @@
         <include refid="DeviceInWellInfo_Column_List"/>
         FROM bus_device d
         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
+        LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=d.ID
         WHERE d.ID
         IN (
-            SELECT dw.DEVICE_ID
-            FROM bus_device_well dw
-            WHERE dw.WELL_ID = #{id}
-            AND dw.VALID='1'
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID='1'
         )
     </select>
 
@@ -278,10 +282,10 @@
         WHERE
         bds.online_State = '0'
         <if test="deviceCode != null and deviceCode !=''">
-            AND  bd.DEVCODE = #{deviceCode}
+            AND bd.DEVCODE = #{deviceCode}
         </if>
         <if test="deviceType != null and deviceType != -1">
-            AND  bd.device_type = #{deviceType}
+            AND bd.device_type = #{deviceType}
         </if>
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 26bb1d7..d32e3b7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
@@ -53,7 +54,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-
     @Autowired
     private Validator validator;
 
@@ -187,16 +187,14 @@
         } else {
             deviceConcentratorService.deleteByDeviceId(entity.getId());
         }
-
         return super.updateById(entity);
     }
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        deptid = null;
         List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
         deviceDtoList.forEach(
-                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState().equals("0")  ? "0" : "1")
+                deviceDto ->deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState())||deviceDto.getOnlineState().equals("0")  ? "0" : "1")
         );
         return deviceDtoList;
     }
@@ -331,7 +329,6 @@
         } else {
             list.add("导入数据不能为空");
         }
-
         return list;
     }
 
@@ -346,8 +343,6 @@
                 //删除设备集中器关联
                 deviceConcentratorService.deleteByDeviceId(id);
             });
-
-
         }
     }