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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 20aa346..abd27dd 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+      TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -716,7 +716,7 @@
                 )
             </if>
         </where>
-        ORDER BY LOGTIME DESC
+        ORDER BY logtime DESC
     </select>
 
     <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 20aa346..abd27dd 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+      TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -716,7 +716,7 @@
                 )
             </if>
         </where>
-        ORDER BY LOGTIME DESC
+        ORDER BY logtime DESC
     </select>
 
     <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
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 19c3484..b92423a 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 20aa346..abd27dd 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+      TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -716,7 +716,7 @@
                 )
             </if>
         </where>
-        ORDER BY LOGTIME DESC
+        ORDER BY logtime DESC
     </select>
 
     <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
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 19c3484..b92423a 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index a61dcee..40767b3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -19,7 +19,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 20aa346..abd27dd 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+      TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -716,7 +716,7 @@
                 )
             </if>
         </where>
-        ORDER BY LOGTIME DESC
+        ORDER BY logtime DESC
     </select>
 
     <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
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 19c3484..b92423a 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index a61dcee..40767b3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -19,7 +19,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 ea76482..9d997fa 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
@@ -63,7 +63,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -164,10 +164,10 @@
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 1 ">
-            and bds.ONLINE_STATE ='0'
+            and dv.onlinestate ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+            and (dv.onlinestate ='1' or  bds.onlinestate is null)
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;

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 8271ce6..593ec5f 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
@@ -30,7 +30,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -80,10 +80,10 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
+        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
-        WHERE    rdv.VALID='1'
+        WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
@@ -110,7 +110,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER  BY  ar.ALARM_TIME DESC
+        ORDER BY ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
@@ -171,9 +171,9 @@
             handle_message = #{handleMessage},
         </set>
         WHERE ID=(
-            SELECT   JOB_ID
-            FROM  alarm_records
-            WHERE ID=#{id}
+        SELECT JOB_ID
+        FROM alarm_records
+        WHERE ID=#{id}
         )
     </update>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..d5f7d4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -103,7 +103,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 20aa346..abd27dd 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+      TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -716,7 +716,7 @@
                 )
             </if>
         </where>
-        ORDER BY LOGTIME DESC
+        ORDER BY logtime DESC
     </select>
 
     <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
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 19c3484..b92423a 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
@@ -83,7 +83,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index a61dcee..40767b3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -19,7 +19,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi:ss')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
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 ea76482..9d997fa 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
@@ -63,7 +63,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
@@ -164,10 +164,10 @@
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 1 ">
-            and bds.ONLINE_STATE ='0'
+            and dv.onlinestate ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+            and (dv.onlinestate ='1' or  bds.onlinestate is null)
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
index 6ef7627..2fd6b9c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
@@ -19,7 +19,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">