diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 48ae812..d9bb2f4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -80,7 +80,6 @@
                 1=0
             </otherwise>
         </choose>
-
     </delete>
 
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 48ae812..d9bb2f4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -80,7 +80,6 @@
                 1=0
             </otherwise>
         </choose>
-
     </delete>
 
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 3be6c65..dde4a34 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -681,7 +681,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        "deviceType",
+        deviceType,
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 48ae812..d9bb2f4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -80,7 +80,6 @@
                 1=0
             </otherwise>
         </choose>
-
     </delete>
 
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 3be6c65..dde4a34 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -681,7 +681,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        "deviceType",
+        deviceType,
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index c729a75..618f499 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -60,7 +60,8 @@
         b.WELL_ID=a.ID LEFT JOIN sys_dept s ON
         a.DEPTID=s.ID LEFT JOIN bus_device d ON
         d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON
-        d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
+        d.DEVICE_TYPE=t.ID
+        where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
         AND c.sensorid =
         <include refid="concat_sql">
             <property name="paramStr" value="#{sensorid}"/>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 48ae812..d9bb2f4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -80,7 +80,6 @@
                 1=0
             </otherwise>
         </choose>
-
     </delete>
 
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 3be6c65..dde4a34 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -681,7 +681,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        "deviceType",
+        deviceType,
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index c729a75..618f499 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -60,7 +60,8 @@
         b.WELL_ID=a.ID LEFT JOIN sys_dept s ON
         a.DEPTID=s.ID LEFT JOIN bus_device d ON
         d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON
-        d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
+        d.DEVICE_TYPE=t.ID
+        where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
         AND c.sensorid =
         <include refid="concat_sql">
             <property name="paramStr" value="#{sensorid}"/>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index af8067c..f73d94f 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -152,6 +152,7 @@
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
         sensorHashMap.put(DeviceTypeEnum.Noise.getIndex(), "000032");
         sensorHashMap.put(DeviceTypeEnum.LG.getIndex(), "000065");
+        sensorHashMap.put(DeviceTypeEnum.H2s.getIndex(), "0000084");
     }
 
 //    private String framecontent;//下发内容