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 62fd6b5..b990166 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
@@ -58,10 +58,9 @@
        TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-
     <select id="alarmList" resultType="map">
         SELECT
-        ar.ID as id,
+        ar.ID as "id",
         bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
@@ -74,10 +73,10 @@
         ar.ALARM_VALUE AS "alarmValue",
         ar.ALARM_LEVEL AS "alarmLevel",
         ar.ALARM_MSG AS "alarmMessage",
-        ar.DEVCODE as devcode,
+        ar.DEVCODE as "devcode",
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID

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 62fd6b5..b990166 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
@@ -58,10 +58,9 @@
        TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-
     <select id="alarmList" resultType="map">
         SELECT
-        ar.ID as id,
+        ar.ID as "id",
         bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
@@ -74,10 +73,10 @@
         ar.ALARM_VALUE AS "alarmValue",
         ar.ALARM_LEVEL AS "alarmLevel",
         ar.ALARM_MSG AS "alarmMessage",
-        ar.DEVCODE as devcode,
+        ar.DEVCODE as "devcode",
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
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 7515612..b53d701 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
@@ -99,8 +99,8 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as deptid
-         ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
+        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}
     </select>

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 62fd6b5..b990166 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
@@ -58,10 +58,9 @@
        TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-
     <select id="alarmList" resultType="map">
         SELECT
-        ar.ID as id,
+        ar.ID as "id",
         bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
@@ -74,10 +73,10 @@
         ar.ALARM_VALUE AS "alarmValue",
         ar.ALARM_LEVEL AS "alarmLevel",
         ar.ALARM_MSG AS "alarmMessage",
-        ar.DEVCODE as devcode,
+        ar.DEVCODE as "devcode",
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
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 7515612..b53d701 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
@@ -99,8 +99,8 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as deptid
-         ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
+        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}
     </select>
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 7008ff9..c85cefc 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
@@ -1413,7 +1413,7 @@
                 OR dh2s.WELL_CODE LIKE<include refid="keywords_sql"/>)
             </if>
         </where>
-        ORDER BY  logtime DESC
+        ORDER BY  uptime DESC
     </select>
 
 </mapper>

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 62fd6b5..b990166 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
@@ -58,10 +58,9 @@
        TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-
     <select id="alarmList" resultType="map">
         SELECT
-        ar.ID as id,
+        ar.ID as "id",
         bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
@@ -74,10 +73,10 @@
         ar.ALARM_VALUE AS "alarmValue",
         ar.ALARM_LEVEL AS "alarmLevel",
         ar.ALARM_MSG AS "alarmMessage",
-        ar.DEVCODE as devcode,
+        ar.DEVCODE as "devcode",
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
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 7515612..b53d701 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
@@ -99,8 +99,8 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as deptid
-         ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
+        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}
     </select>
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 7008ff9..c85cefc 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
@@ -1413,7 +1413,7 @@
                 OR dh2s.WELL_CODE LIKE<include refid="keywords_sql"/>)
             </if>
         </where>
-        ORDER BY  logtime DESC
+        ORDER BY  uptime DESC
     </select>
 
 </mapper>
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 8ef5725..b3cce52 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -161,6 +161,12 @@
             <artifactId>postgresql</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.8</version>
+        </dependency>
+
         <!--<dependency>-->
             <!--<groupId>io.springfox</groupId>-->
             <!--<artifactId>springfox-swagger2</artifactId>-->

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 62fd6b5..b990166 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
@@ -58,10 +58,9 @@
        TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
-
     <select id="alarmList" resultType="map">
         SELECT
-        ar.ID as id,
+        ar.ID as "id",
         bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
@@ -74,10 +73,10 @@
         ar.ALARM_VALUE AS "alarmValue",
         ar.ALARM_LEVEL AS "alarmLevel",
         ar.ALARM_MSG AS "alarmMessage",
-        ar.DEVCODE as devcode,
+        ar.DEVCODE as "devcode",
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
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 7515612..b53d701 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
@@ -99,8 +99,8 @@
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
-        SELECT ID as "wellId",POSITION as position,DEPTID as deptid
-         ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
+        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}
     </select>
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 7008ff9..c85cefc 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
@@ -1413,7 +1413,7 @@
                 OR dh2s.WELL_CODE LIKE<include refid="keywords_sql"/>)
             </if>
         </where>
-        ORDER BY  logtime DESC
+        ORDER BY  uptime DESC
     </select>
 
 </mapper>
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 8ef5725..b3cce52 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -161,6 +161,12 @@
             <artifactId>postgresql</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.8</version>
+        </dependency>
+
         <!--<dependency>-->
             <!--<groupId>io.springfox</groupId>-->
             <!--<artifactId>springfox-swagger2</artifactId>-->
diff --git a/pom.xml b/pom.xml
index 1591db7..040ce65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,8 @@
                 <version>2.4.5</version>
             </dependency>
 
+
+
         </dependencies>
     </dependencyManagement>