diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 592aa26..a22cac0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -110,18 +110,17 @@
     @BussinessLog(value = "添加井", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class)
     public Object add(BusWellInfo busWellInfo) {
 
-        Utility.convertCoordinate(busWellInfo);
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
 
         try {
-            if(null==busWellInfo.getResponsibleDept()){
+            if (null == busWellInfo.getResponsibleDept()) {
                 busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
-
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //            if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //                busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //            }
-
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
@@ -148,9 +147,9 @@
     @BussinessLog(value = "删除井信息")
     public Object delete(@RequestParam List<Long> ids) {
         List<Long> notDelIds = busWellInfoService.deleteBatchByIds(ids);
-        if(notDelIds.size() > 0){
+        if (notDelIds.size() > 0) {
             String message = "";
-            for(Long notDelId : notDelIds){
+            for (Long notDelId : notDelIds) {
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
@@ -172,9 +171,9 @@
         }
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
-
-        Utility.convertCoordinate(busWellInfo);
-        if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
+        if (ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())) {
             busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -205,7 +204,7 @@
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        BusWellInfo   busWellInfo=busWellInfoService.getById(id);
+        BusWellInfo busWellInfo = busWellInfoService.getById(id);
         busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt()));
         resultData.setData(busWellInfo);
         return resultData;
@@ -217,10 +216,10 @@
     @RequestMapping(value = "/bfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object bfcf(Long wellId, String bfzt) {
-        if (null ==wellId || StrUtil.isEmpty(bfzt)) {
+        if (null == wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        busWellInfoService.armingById(wellId,bfzt);
+        busWellInfoService.armingById(wellId, bfzt);
         return ResponseData.success();
     }
 
@@ -237,7 +236,6 @@
     }
 
 
-
     /**
      * 批量导入闸井接口
      */
@@ -263,7 +261,7 @@
         mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
-                results = this.importExcel(BusWellInfo.class,file,null,null);
+                results = this.importExcel(BusWellInfo.class, file, null, null);
 
                 List<String> list = busWellInfoService.addWellBatch(results);
 
@@ -317,7 +315,7 @@
 //            add(new Header("设备数量", "deviceCount"));
 //            add(new Header("布防状态", "bfztName"));
 //        }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT
-        super.exportExcel(BatchExportDataDto.class, list,"闸井列表");
+        super.exportExcel(BatchExportDataDto.class, list, "闸井列表");
 
         //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response);
     }
@@ -342,17 +340,18 @@
 
     /**
      * 全部坐标转换接口
+     *
      * @return
      */
     @RequestMapping(value = "/changeCoordinates", method = RequestMethod.GET)
     @ResponseBody
-    public Object changeCoordinates(int startNumber){
+    public Object changeCoordinates(int startNumber) {
         Boolean result = busWellInfoService.changeCoordinates(startNumber);
-        if(result==true){
-            return  new SuccessResponseData(200,"转换成功",null);
+        if (result == true) {
+            return new SuccessResponseData(200, "转换成功", null);
 
-        }else{
-            return  new SuccessResponseData(200,"转换失败",null);
+        } else {
+            return new SuccessResponseData(200, "转换失败", null);
         }
     }
 
@@ -369,15 +368,16 @@
 
     /**
      * 根据井编号获取井信息
+     *
      * @return
      */
     @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET)
     @ResponseBody
-    public Object getWellByCode(String wellCode){
+    public Object getWellByCode(String wellCode) {
         QueryWrapper<BusWellInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("WELL_CODE",wellCode);
-        wrapper.eq("valid",1);
-        return  new SuccessResponseData(busWellInfoService.getOne(wrapper));
+        wrapper.eq("WELL_CODE", wellCode);
+        wrapper.eq("valid", 1);
+        return new SuccessResponseData(busWellInfoService.getOne(wrapper));
     }
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 592aa26..a22cac0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -110,18 +110,17 @@
     @BussinessLog(value = "添加井", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class)
     public Object add(BusWellInfo busWellInfo) {
 
-        Utility.convertCoordinate(busWellInfo);
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
 
         try {
-            if(null==busWellInfo.getResponsibleDept()){
+            if (null == busWellInfo.getResponsibleDept()) {
                 busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
-
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //            if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //                busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //            }
-
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
@@ -148,9 +147,9 @@
     @BussinessLog(value = "删除井信息")
     public Object delete(@RequestParam List<Long> ids) {
         List<Long> notDelIds = busWellInfoService.deleteBatchByIds(ids);
-        if(notDelIds.size() > 0){
+        if (notDelIds.size() > 0) {
             String message = "";
-            for(Long notDelId : notDelIds){
+            for (Long notDelId : notDelIds) {
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
@@ -172,9 +171,9 @@
         }
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
-
-        Utility.convertCoordinate(busWellInfo);
-        if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
+        if (ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())) {
             busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -205,7 +204,7 @@
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        BusWellInfo   busWellInfo=busWellInfoService.getById(id);
+        BusWellInfo busWellInfo = busWellInfoService.getById(id);
         busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt()));
         resultData.setData(busWellInfo);
         return resultData;
@@ -217,10 +216,10 @@
     @RequestMapping(value = "/bfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object bfcf(Long wellId, String bfzt) {
-        if (null ==wellId || StrUtil.isEmpty(bfzt)) {
+        if (null == wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        busWellInfoService.armingById(wellId,bfzt);
+        busWellInfoService.armingById(wellId, bfzt);
         return ResponseData.success();
     }
 
@@ -237,7 +236,6 @@
     }
 
 
-
     /**
      * 批量导入闸井接口
      */
@@ -263,7 +261,7 @@
         mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
-                results = this.importExcel(BusWellInfo.class,file,null,null);
+                results = this.importExcel(BusWellInfo.class, file, null, null);
 
                 List<String> list = busWellInfoService.addWellBatch(results);
 
@@ -317,7 +315,7 @@
 //            add(new Header("设备数量", "deviceCount"));
 //            add(new Header("布防状态", "bfztName"));
 //        }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT
-        super.exportExcel(BatchExportDataDto.class, list,"闸井列表");
+        super.exportExcel(BatchExportDataDto.class, list, "闸井列表");
 
         //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response);
     }
@@ -342,17 +340,18 @@
 
     /**
      * 全部坐标转换接口
+     *
      * @return
      */
     @RequestMapping(value = "/changeCoordinates", method = RequestMethod.GET)
     @ResponseBody
-    public Object changeCoordinates(int startNumber){
+    public Object changeCoordinates(int startNumber) {
         Boolean result = busWellInfoService.changeCoordinates(startNumber);
-        if(result==true){
-            return  new SuccessResponseData(200,"转换成功",null);
+        if (result == true) {
+            return new SuccessResponseData(200, "转换成功", null);
 
-        }else{
-            return  new SuccessResponseData(200,"转换失败",null);
+        } else {
+            return new SuccessResponseData(200, "转换失败", null);
         }
     }
 
@@ -369,15 +368,16 @@
 
     /**
      * 根据井编号获取井信息
+     *
      * @return
      */
     @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET)
     @ResponseBody
-    public Object getWellByCode(String wellCode){
+    public Object getWellByCode(String wellCode) {
         QueryWrapper<BusWellInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("WELL_CODE",wellCode);
-        wrapper.eq("valid",1);
-        return  new SuccessResponseData(busWellInfoService.getOne(wrapper));
+        wrapper.eq("WELL_CODE", wellCode);
+        wrapper.eq("valid", 1);
+        return new SuccessResponseData(busWellInfoService.getOne(wrapper));
     }
 
 }
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 7d1d92c..ed36db7 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
@@ -66,12 +66,12 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(1) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1'
-            AND d.VALID='1'
-            GROUP BY well_id
+        SELECT COUNT(1) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device bd ON bd.id=d.device_id
+        WHERE bd.VALID = '1'
+        AND d.VALID='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
@@ -89,6 +89,8 @@
             <include refid="keywords_sql"/>
             or w.POSITION like
             <include refid="keywords_sql"/>
+            OR w.WELL_NAME LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         <include refid="count_sort_sql"/>
@@ -105,7 +107,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 592aa26..a22cac0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -110,18 +110,17 @@
     @BussinessLog(value = "添加井", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class)
     public Object add(BusWellInfo busWellInfo) {
 
-        Utility.convertCoordinate(busWellInfo);
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
 
         try {
-            if(null==busWellInfo.getResponsibleDept()){
+            if (null == busWellInfo.getResponsibleDept()) {
                 busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
-
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //            if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //                busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //            }
-
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
@@ -148,9 +147,9 @@
     @BussinessLog(value = "删除井信息")
     public Object delete(@RequestParam List<Long> ids) {
         List<Long> notDelIds = busWellInfoService.deleteBatchByIds(ids);
-        if(notDelIds.size() > 0){
+        if (notDelIds.size() > 0) {
             String message = "";
-            for(Long notDelId : notDelIds){
+            for (Long notDelId : notDelIds) {
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
@@ -172,9 +171,9 @@
         }
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
-
-        Utility.convertCoordinate(busWellInfo);
-        if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
+        if (ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())) {
             busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -205,7 +204,7 @@
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        BusWellInfo   busWellInfo=busWellInfoService.getById(id);
+        BusWellInfo busWellInfo = busWellInfoService.getById(id);
         busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt()));
         resultData.setData(busWellInfo);
         return resultData;
@@ -217,10 +216,10 @@
     @RequestMapping(value = "/bfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object bfcf(Long wellId, String bfzt) {
-        if (null ==wellId || StrUtil.isEmpty(bfzt)) {
+        if (null == wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        busWellInfoService.armingById(wellId,bfzt);
+        busWellInfoService.armingById(wellId, bfzt);
         return ResponseData.success();
     }
 
@@ -237,7 +236,6 @@
     }
 
 
-
     /**
      * 批量导入闸井接口
      */
@@ -263,7 +261,7 @@
         mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
-                results = this.importExcel(BusWellInfo.class,file,null,null);
+                results = this.importExcel(BusWellInfo.class, file, null, null);
 
                 List<String> list = busWellInfoService.addWellBatch(results);
 
@@ -317,7 +315,7 @@
 //            add(new Header("设备数量", "deviceCount"));
 //            add(new Header("布防状态", "bfztName"));
 //        }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT
-        super.exportExcel(BatchExportDataDto.class, list,"闸井列表");
+        super.exportExcel(BatchExportDataDto.class, list, "闸井列表");
 
         //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response);
     }
@@ -342,17 +340,18 @@
 
     /**
      * 全部坐标转换接口
+     *
      * @return
      */
     @RequestMapping(value = "/changeCoordinates", method = RequestMethod.GET)
     @ResponseBody
-    public Object changeCoordinates(int startNumber){
+    public Object changeCoordinates(int startNumber) {
         Boolean result = busWellInfoService.changeCoordinates(startNumber);
-        if(result==true){
-            return  new SuccessResponseData(200,"转换成功",null);
+        if (result == true) {
+            return new SuccessResponseData(200, "转换成功", null);
 
-        }else{
-            return  new SuccessResponseData(200,"转换失败",null);
+        } else {
+            return new SuccessResponseData(200, "转换失败", null);
         }
     }
 
@@ -369,15 +368,16 @@
 
     /**
      * 根据井编号获取井信息
+     *
      * @return
      */
     @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET)
     @ResponseBody
-    public Object getWellByCode(String wellCode){
+    public Object getWellByCode(String wellCode) {
         QueryWrapper<BusWellInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("WELL_CODE",wellCode);
-        wrapper.eq("valid",1);
-        return  new SuccessResponseData(busWellInfoService.getOne(wrapper));
+        wrapper.eq("WELL_CODE", wellCode);
+        wrapper.eq("valid", 1);
+        return new SuccessResponseData(busWellInfoService.getOne(wrapper));
     }
 
 }
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 7d1d92c..ed36db7 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
@@ -66,12 +66,12 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(1) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1'
-            AND d.VALID='1'
-            GROUP BY well_id
+        SELECT COUNT(1) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device bd ON bd.id=d.device_id
+        WHERE bd.VALID = '1'
+        AND d.VALID='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
@@ -89,6 +89,8 @@
             <include refid="keywords_sql"/>
             or w.POSITION like
             <include refid="keywords_sql"/>
+            OR w.WELL_NAME LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         <include refid="count_sort_sql"/>
@@ -105,7 +107,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index ac2f2a0..18b3b7b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -168,13 +168,13 @@
                     list.add("第" + index[0] + "行，区与街道名不对应！");
                     break;
                 }
-
-                if (sluicewellTypeMap.containsKey(well.getWellType())) {
-                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
-                } else {
-                    list.add("第" + index[0] + "行，井类型不存在！");
-                    break;
-                }
+//达州去除点位类型判断
+//                if (sluicewellTypeMap.containsKey(well.getWellType())) {
+//                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
+//                } else {
+//                    list.add("第" + index[0] + "行，井类型不存在！");
+//                    break;
+//                }
 
                 String coordinateX = well.getCoordinateX().length() > 10 ? well.getCoordinateX().substring(0, 10) : well.getCoordinateX();
                 String coordinateY = well.getCoordinateY().length() > 9 ? well.getCoordinateY().substring(0, 9) : well.getCoordinateY();
@@ -194,29 +194,29 @@
             String coordinate = sluicewellProperties.getCoordinate().toLowerCase();
             List<String> convertCoordinates = null;
 
-            if ("baidu".equals(coordinate)) {
-                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
-            } else if ("gaode".equals(coordinate)) {
-                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
-            }
-
-            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
-                    results.size() == convertCoordinates.size()) {
-
-                if ("baidu".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngBaidu(xy[0]);
-                        results.get(i).setLatBaidu(xy[1]);
-                    }
-                } else if ("gaode".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngGaode(xy[0]);
-                        results.get(i).setLatGaode(xy[1]);
-                    }
-                }
-            }
+//            if ("baidu".equals(coordinate)) {
+//                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
+//            } else if ("gaode".equals(coordinate)) {
+//                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
+//            }
+//
+//            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
+//                    results.size() == convertCoordinates.size()) {
+//
+//                if ("baidu".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngBaidu(xy[0]);
+//                        results.get(i).setLatBaidu(xy[1]);
+//                    }
+//                } else if ("gaode".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngGaode(xy[0]);
+//                        results.get(i).setLatGaode(xy[1]);
+//                    }
+//                }
+//            }
 
             this.saveBatch(results);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 592aa26..a22cac0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -110,18 +110,17 @@
     @BussinessLog(value = "添加井", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class)
     public Object add(BusWellInfo busWellInfo) {
 
-        Utility.convertCoordinate(busWellInfo);
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
 
         try {
-            if(null==busWellInfo.getResponsibleDept()){
+            if (null == busWellInfo.getResponsibleDept()) {
                 busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
-
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //            if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //                busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //            }
-
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
@@ -148,9 +147,9 @@
     @BussinessLog(value = "删除井信息")
     public Object delete(@RequestParam List<Long> ids) {
         List<Long> notDelIds = busWellInfoService.deleteBatchByIds(ids);
-        if(notDelIds.size() > 0){
+        if (notDelIds.size() > 0) {
             String message = "";
-            for(Long notDelId : notDelIds){
+            for (Long notDelId : notDelIds) {
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
@@ -172,9 +171,9 @@
         }
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
-
-        Utility.convertCoordinate(busWellInfo);
-        if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
+        if (ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())) {
             busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -205,7 +204,7 @@
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        BusWellInfo   busWellInfo=busWellInfoService.getById(id);
+        BusWellInfo busWellInfo = busWellInfoService.getById(id);
         busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt()));
         resultData.setData(busWellInfo);
         return resultData;
@@ -217,10 +216,10 @@
     @RequestMapping(value = "/bfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object bfcf(Long wellId, String bfzt) {
-        if (null ==wellId || StrUtil.isEmpty(bfzt)) {
+        if (null == wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        busWellInfoService.armingById(wellId,bfzt);
+        busWellInfoService.armingById(wellId, bfzt);
         return ResponseData.success();
     }
 
@@ -237,7 +236,6 @@
     }
 
 
-
     /**
      * 批量导入闸井接口
      */
@@ -263,7 +261,7 @@
         mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
-                results = this.importExcel(BusWellInfo.class,file,null,null);
+                results = this.importExcel(BusWellInfo.class, file, null, null);
 
                 List<String> list = busWellInfoService.addWellBatch(results);
 
@@ -317,7 +315,7 @@
 //            add(new Header("设备数量", "deviceCount"));
 //            add(new Header("布防状态", "bfztName"));
 //        }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT
-        super.exportExcel(BatchExportDataDto.class, list,"闸井列表");
+        super.exportExcel(BatchExportDataDto.class, list, "闸井列表");
 
         //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response);
     }
@@ -342,17 +340,18 @@
 
     /**
      * 全部坐标转换接口
+     *
      * @return
      */
     @RequestMapping(value = "/changeCoordinates", method = RequestMethod.GET)
     @ResponseBody
-    public Object changeCoordinates(int startNumber){
+    public Object changeCoordinates(int startNumber) {
         Boolean result = busWellInfoService.changeCoordinates(startNumber);
-        if(result==true){
-            return  new SuccessResponseData(200,"转换成功",null);
+        if (result == true) {
+            return new SuccessResponseData(200, "转换成功", null);
 
-        }else{
-            return  new SuccessResponseData(200,"转换失败",null);
+        } else {
+            return new SuccessResponseData(200, "转换失败", null);
         }
     }
 
@@ -369,15 +368,16 @@
 
     /**
      * 根据井编号获取井信息
+     *
      * @return
      */
     @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET)
     @ResponseBody
-    public Object getWellByCode(String wellCode){
+    public Object getWellByCode(String wellCode) {
         QueryWrapper<BusWellInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("WELL_CODE",wellCode);
-        wrapper.eq("valid",1);
-        return  new SuccessResponseData(busWellInfoService.getOne(wrapper));
+        wrapper.eq("WELL_CODE", wellCode);
+        wrapper.eq("valid", 1);
+        return new SuccessResponseData(busWellInfoService.getOne(wrapper));
     }
 
 }
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 7d1d92c..ed36db7 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
@@ -66,12 +66,12 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(1) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1'
-            AND d.VALID='1'
-            GROUP BY well_id
+        SELECT COUNT(1) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device bd ON bd.id=d.device_id
+        WHERE bd.VALID = '1'
+        AND d.VALID='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
@@ -89,6 +89,8 @@
             <include refid="keywords_sql"/>
             or w.POSITION like
             <include refid="keywords_sql"/>
+            OR w.WELL_NAME LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         <include refid="count_sort_sql"/>
@@ -105,7 +107,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index ac2f2a0..18b3b7b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -168,13 +168,13 @@
                     list.add("第" + index[0] + "行，区与街道名不对应！");
                     break;
                 }
-
-                if (sluicewellTypeMap.containsKey(well.getWellType())) {
-                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
-                } else {
-                    list.add("第" + index[0] + "行，井类型不存在！");
-                    break;
-                }
+//达州去除点位类型判断
+//                if (sluicewellTypeMap.containsKey(well.getWellType())) {
+//                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
+//                } else {
+//                    list.add("第" + index[0] + "行，井类型不存在！");
+//                    break;
+//                }
 
                 String coordinateX = well.getCoordinateX().length() > 10 ? well.getCoordinateX().substring(0, 10) : well.getCoordinateX();
                 String coordinateY = well.getCoordinateY().length() > 9 ? well.getCoordinateY().substring(0, 9) : well.getCoordinateY();
@@ -194,29 +194,29 @@
             String coordinate = sluicewellProperties.getCoordinate().toLowerCase();
             List<String> convertCoordinates = null;
 
-            if ("baidu".equals(coordinate)) {
-                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
-            } else if ("gaode".equals(coordinate)) {
-                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
-            }
-
-            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
-                    results.size() == convertCoordinates.size()) {
-
-                if ("baidu".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngBaidu(xy[0]);
-                        results.get(i).setLatBaidu(xy[1]);
-                    }
-                } else if ("gaode".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngGaode(xy[0]);
-                        results.get(i).setLatGaode(xy[1]);
-                    }
-                }
-            }
+//            if ("baidu".equals(coordinate)) {
+//                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
+//            } else if ("gaode".equals(coordinate)) {
+//                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
+//            }
+//
+//            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
+//                    results.size() == convertCoordinates.size()) {
+//
+//                if ("baidu".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngBaidu(xy[0]);
+//                        results.get(i).setLatBaidu(xy[1]);
+//                    }
+//                } else if ("gaode".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngGaode(xy[0]);
+//                        results.get(i).setLatGaode(xy[1]);
+//                    }
+//                }
+//            }
 
             this.saveBatch(results);
 
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 0bbb52c..179d91c 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "ceshi";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index 61a690e..3244845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -26,16 +26,16 @@
     private String devcode;
     @ExcelProperty("详细地址")
     private String position;
-    @ExcelProperty("告警类型")
+    @ExcelProperty("报警类型")
     private String alarmTypeName;
-    @ExcelProperty("告警原因")
+    @ExcelProperty("报警原因")
     private String alarmContentName;
-    @ExcelProperty("告警等级")
+    @ExcelProperty("报警等级")
     private String alarmLevel;
-    @ExcelProperty("告警数值")
+    @ExcelProperty("报警数值")
     private String alarmValue;
     @ExcelProperty("权属单位")
     private String deptName;
-    @ExcelProperty("告警时间")
+    @ExcelProperty("报警时间")
     private String logTime;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index aafb00b..4ccdac9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -80,15 +80,18 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
+        JOIN bus_well_info bwi ON rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ( bwi.WELL_CODE like
             <include refid="keywords_sql"/>
+            or bwi.WELL_NAME like
+            <include refid="keywords_sql"/>
+            )
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 8549dac..b616f29 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as "deptid"
+        SELECT ID as "wellId",POSITION as "position",DEPTID as "deptid"
          ,coalesce(STAFF,'') as "staff",coalesce(TEL,'') as "tel"
         FROM bus_well_info
         WHERE WELL_CODE = #{wellCode}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index e4c3acf..a5617b7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -13,6 +13,19 @@
     </sql>
 
 
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+    </sql>
+
+
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
         position AS "location",onlineState AS "status"
@@ -32,7 +45,11 @@
     </select>
 
     <select id="deviceValue" resultType="com.casic.missiles.modular.system.model.DeviceValueMapVO">
-        SELECT strength AS "value",devcode AS "code"
+        SELECT strength AS "value",devcode AS "code",
+        <include refid="date_toChar">
+            <property name="paramTime" value="LOGTIME"/>
+        </include>
+        AS "logtime"
         FROM data_h2s
         WHERE devcode =#{devcode}
         order by logtime desc
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 d96939d..4dcb72a 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
@@ -1373,6 +1373,7 @@
         SELECT
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE AS "wellCode",
+        bwi.WELL_NAME AS "wellName",
         dh2s.STRENGTH AS strength,
         dh2s.CELL AS cell,
         <include refid="date_toChar">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 30a2d47..903396b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -616,6 +616,7 @@
         dh2s.DEVCODE AS devcode,
         dh2s.WELL_CODE,
         dh2s.STRENGTH,
+        bwi.WELL_NAME,
         dh2s.CELL,
         <include refid="date_toChar">
             <property name="paramTime" value="dh2s.UPTIME"/>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
index 6384080..afc9392 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceMapVO.java
@@ -22,6 +22,11 @@
      * 设备名称
      */
     private String name;
+
+    /**
+     * 设备名称
+     */
+    private String wellName;
     /**
      * 设备编号
      */
@@ -34,4 +39,6 @@
      * 在线状态
      */
     private Float status;
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
index e06a397..9fbdf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/DeviceValueMapVO.java
@@ -6,5 +6,6 @@
 public class DeviceValueMapVO {
 
    private  String code;
+   private  String logtime;
    private  Float value;
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f1eee57..58b94a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -207,7 +207,7 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
-            case "硫化氢检测终端":
+            case "硫化氢泄漏检测仪":
                 deviceData = this.baseMapper.H2sData(devcode);
                 if (ObjectUtil.isNotEmpty(deviceData)) {
                     deviceDataDto.setTypeName("H2S浓度");
@@ -459,7 +459,7 @@
                         watchDataDto.setData("无数据");
                     }
                     break;
-                case "硫化氢检测终端":
+                case "硫化氢泄漏检测仪":
                     deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode());
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 3a1b275..5f0f292 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -194,6 +194,9 @@
                 return new ErrorResponseData(list.get(0));
             }
         } catch (Exception e) {
+            if(e.getMessage().contains("唯一性")){
+                return catchMybatisPlusException(e, "导入的设备编号重复，导入设备失败");
+            }
             return catchMybatisPlusException(e, "导入设备失败");
         }
         return ResponseData.success();
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 990fc49..36981ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
             <property name="paramDate" value="INSTALLDATE"/>
         </include>
@@ -189,6 +189,8 @@
             <include refid="keywords_sql"/>
             OR wellCode LIKE
             <include refid="keywords_sql"/>
+            OR wellName LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         ORDER BY INSTALLDATE DESC
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..d5c106a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,12 +27,10 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
     private String wellType;
-    @ExcelProperty("点位类型")
     private String wellTypeName;
 
     private String deptId;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index c1a875e..5341c80 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -51,13 +51,14 @@
     @ExcelProperty("点位编号")
     @Length(max = 15, min = 12)
     private String wellCode;
+    private String wellName;
     @ExcelProperty("设备编号")
     private String devcode;
     private String deviceName;
     private Long deviceType;//设备类型
     @ExcelProperty("设备类型")
     private String deviceTypeName;//设备类型名称
-//    @ExcelProperty("监控内容")
+    //    @ExcelProperty("监控内容")
     private String watchType;
     private String communication;
     private Long modelId;
@@ -70,10 +71,10 @@
     @ExcelProperty("设备位置")
     private String position;
     private Long concenId;
-//    @ExcelProperty("集中器编号")
+    //    @ExcelProperty("集中器编号")
     private String concenCode;
     private String onlineState;
-//    @ExcelProperty("在线状态")
+    //    @ExcelProperty("在线状态")
     private String onlineStateName;
     private String valid;
     private String ts;
@@ -82,7 +83,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
-//    @ExcelProperty("浮子电线长度")
+    //    @ExcelProperty("浮子电线长度")
     private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index d4481d2..d014640 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -14,7 +14,7 @@
     FireHydrant("消防栓防盗水监测仪", 11),
     Tube("管盯", 12),
     LG("井盖液位一体机", 13),
-    H2s("硫化氢检测终端", 14);
+    H2s("检测终端", 14);
 
     // 成员变量
     private String name;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 9fbd104..df7ec55 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -29,6 +29,10 @@
 
     @ExcelProperty("点位编号")
     private String wellCode;
+
+    @ExcelProperty("点位名称")
+    private String wellName;
+
     private String deviceType;
 
     @ExcelProperty("设备类型")
@@ -39,7 +43,7 @@
     @ExcelProperty("权属部门")
     private String deptName;
 
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（ppm）")
     private String strength;
 
     @ExcelProperty("电量（%）")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
index 993a9b3..fec49c4 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -17,6 +17,9 @@
     @ExcelProperty("点位编号")
     private String wellCode;
 
+    @ExcelProperty("点位编号")
+    private String wellName;
+
     @ExcelProperty("设备类型")
     private String deviceType;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 592aa26..a22cac0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -110,18 +110,17 @@
     @BussinessLog(value = "添加井", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class)
     public Object add(BusWellInfo busWellInfo) {
 
-        Utility.convertCoordinate(busWellInfo);
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
 
         try {
-            if(null==busWellInfo.getResponsibleDept()){
+            if (null == busWellInfo.getResponsibleDept()) {
                 busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
-
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //            if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //                busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //            }
-
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
@@ -148,9 +147,9 @@
     @BussinessLog(value = "删除井信息")
     public Object delete(@RequestParam List<Long> ids) {
         List<Long> notDelIds = busWellInfoService.deleteBatchByIds(ids);
-        if(notDelIds.size() > 0){
+        if (notDelIds.size() > 0) {
             String message = "";
-            for(Long notDelId : notDelIds){
+            for (Long notDelId : notDelIds) {
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
@@ -172,9 +171,9 @@
         }
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
-
-        Utility.convertCoordinate(busWellInfo);
-        if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
+// 达州内部网络调不通该API,实际需求不需要
+//        Utility.convertCoordinate(busWellInfo);
+        if (ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())) {
             busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -205,7 +204,7 @@
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        BusWellInfo   busWellInfo=busWellInfoService.getById(id);
+        BusWellInfo busWellInfo = busWellInfoService.getById(id);
         busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt()));
         resultData.setData(busWellInfo);
         return resultData;
@@ -217,10 +216,10 @@
     @RequestMapping(value = "/bfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object bfcf(Long wellId, String bfzt) {
-        if (null ==wellId || StrUtil.isEmpty(bfzt)) {
+        if (null == wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        busWellInfoService.armingById(wellId,bfzt);
+        busWellInfoService.armingById(wellId, bfzt);
         return ResponseData.success();
     }
 
@@ -237,7 +236,6 @@
     }
 
 
-
     /**
      * 批量导入闸井接口
      */
@@ -263,7 +261,7 @@
         mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
-                results = this.importExcel(BusWellInfo.class,file,null,null);
+                results = this.importExcel(BusWellInfo.class, file, null, null);
 
                 List<String> list = busWellInfoService.addWellBatch(results);
 
@@ -317,7 +315,7 @@
 //            add(new Header("设备数量", "deviceCount"));
 //            add(new Header("布防状态", "bfztName"));
 //        }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT
-        super.exportExcel(BatchExportDataDto.class, list,"闸井列表");
+        super.exportExcel(BatchExportDataDto.class, list, "闸井列表");
 
         //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response);
     }
@@ -342,17 +340,18 @@
 
     /**
      * 全部坐标转换接口
+     *
      * @return
      */
     @RequestMapping(value = "/changeCoordinates", method = RequestMethod.GET)
     @ResponseBody
-    public Object changeCoordinates(int startNumber){
+    public Object changeCoordinates(int startNumber) {
         Boolean result = busWellInfoService.changeCoordinates(startNumber);
-        if(result==true){
-            return  new SuccessResponseData(200,"转换成功",null);
+        if (result == true) {
+            return new SuccessResponseData(200, "转换成功", null);
 
-        }else{
-            return  new SuccessResponseData(200,"转换失败",null);
+        } else {
+            return new SuccessResponseData(200, "转换失败", null);
         }
     }
 
@@ -369,15 +368,16 @@
 
     /**
      * 根据井编号获取井信息
+     *
      * @return
      */
     @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET)
     @ResponseBody
-    public Object getWellByCode(String wellCode){
+    public Object getWellByCode(String wellCode) {
         QueryWrapper<BusWellInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("WELL_CODE",wellCode);
-        wrapper.eq("valid",1);
-        return  new SuccessResponseData(busWellInfoService.getOne(wrapper));
+        wrapper.eq("WELL_CODE", wellCode);
+        wrapper.eq("valid", 1);
+        return new SuccessResponseData(busWellInfoService.getOne(wrapper));
     }
 
 }
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 7d1d92c..ed36db7 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
@@ -66,12 +66,12 @@
         FROM bus_well_info w
         LEFT JOIN
         (
-            SELECT COUNT(1) AS devicecount,well_id
-            FROM bus_device_well d
-            JOIN bus_device  bd ON  bd.id=d.device_id
-            WHERE bd.VALID = '1'
-            AND d.VALID='1'
-            GROUP BY well_id
+        SELECT COUNT(1) AS devicecount,well_id
+        FROM bus_device_well d
+        JOIN bus_device bd ON bd.id=d.device_id
+        WHERE bd.VALID = '1'
+        AND d.VALID='1'
+        GROUP BY well_id
         ) c
         ON w.id = c.well_id
         WHERE w.VALID = '1'
@@ -89,6 +89,8 @@
             <include refid="keywords_sql"/>
             or w.POSITION like
             <include refid="keywords_sql"/>
+            OR w.WELL_NAME LIKE
+            <include refid="keywords_sql"/>
             )
         </if>
         <include refid="count_sort_sql"/>
@@ -105,7 +107,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index ac2f2a0..18b3b7b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -168,13 +168,13 @@
                     list.add("第" + index[0] + "行，区与街道名不对应！");
                     break;
                 }
-
-                if (sluicewellTypeMap.containsKey(well.getWellType())) {
-                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
-                } else {
-                    list.add("第" + index[0] + "行，井类型不存在！");
-                    break;
-                }
+//达州去除点位类型判断
+//                if (sluicewellTypeMap.containsKey(well.getWellType())) {
+//                    well.setWellType(sluicewellTypeMap.get(well.getWellType()));
+//                } else {
+//                    list.add("第" + index[0] + "行，井类型不存在！");
+//                    break;
+//                }
 
                 String coordinateX = well.getCoordinateX().length() > 10 ? well.getCoordinateX().substring(0, 10) : well.getCoordinateX();
                 String coordinateY = well.getCoordinateY().length() > 9 ? well.getCoordinateY().substring(0, 9) : well.getCoordinateY();
@@ -194,29 +194,29 @@
             String coordinate = sluicewellProperties.getCoordinate().toLowerCase();
             List<String> convertCoordinates = null;
 
-            if ("baidu".equals(coordinate)) {
-                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
-            } else if ("gaode".equals(coordinate)) {
-                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
-            }
-
-            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
-                    results.size() == convertCoordinates.size()) {
-
-                if ("baidu".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngBaidu(xy[0]);
-                        results.get(i).setLatBaidu(xy[1]);
-                    }
-                } else if ("gaode".equals(coordinate)) {
-                    for (int i = 0; i < convertCoordinates.size(); i++) {
-                        String[] xy = convertCoordinates.get(i).split(",");
-                        results.get(i).setLngGaode(xy[0]);
-                        results.get(i).setLatGaode(xy[1]);
-                    }
-                }
-            }
+//            if ("baidu".equals(coordinate)) {
+//                convertCoordinates = Utility.convertBaiduAPI(gpsCoordinates);
+//            } else if ("gaode".equals(coordinate)) {
+//                convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
+//            }
+//
+//            if (CollectionUtil.isNotEmpty(convertCoordinates) &&
+//                    results.size() == convertCoordinates.size()) {
+//
+//                if ("baidu".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngBaidu(xy[0]);
+//                        results.get(i).setLatBaidu(xy[1]);
+//                    }
+//                } else if ("gaode".equals(coordinate)) {
+//                    for (int i = 0; i < convertCoordinates.size(); i++) {
+//                        String[] xy = convertCoordinates.get(i).split(",");
+//                        results.get(i).setLngGaode(xy[0]);
+//                        results.get(i).setLatGaode(xy[1]);
+//                    }
+//                }
+//            }
 
             this.saveBatch(results);
 
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 0bbb52c..179d91c 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "ceshi";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml
index f94ed65..7293eec 100644
--- a/casic-web/src/main/resources/config/application-dm.yml
+++ b/casic-web/src/main/resources/config/application-dm.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11308
+  port: 11414
 ###################  spring配置  ###################
 spring:
   datasource:
@@ -44,7 +44,7 @@
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token
   db:
     init:
       enable: false