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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index c26b3b7..f4a17d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -26,18 +26,19 @@
     <sql id="devCode_sql" databaseId="mysql">
         CONCAT(#{devCode})
     </sql>
-    <select id="getSensorCodeByDevCode" resultType="String">
+    <sql id="devCode_sql" databaseId="pgsql">
+        CONCAT(#{devCode})
+    </sql>
 
+    <select id="getSensorCodeByDevCode" resultType="String">
         SELECT b.SENSORCODE AS SENSORCODE
         FROM base_sensor b
         LEFT JOIN bus_device d ON b.DEVICE_TYPE=d.DEVICE_TYPE
-        WHERE d.VALID=1
-
+        WHERE d.VALID = 1
         <!--<if test="devCode != null and devCode !=''">-->
         and d.DEVCODE =
         <include refid="devCode_sql"/>
         <!--</if>-->
     </select>
 
-
 </mapper>

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index c26b3b7..f4a17d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -26,18 +26,19 @@
     <sql id="devCode_sql" databaseId="mysql">
         CONCAT(#{devCode})
     </sql>
-    <select id="getSensorCodeByDevCode" resultType="String">
+    <sql id="devCode_sql" databaseId="pgsql">
+        CONCAT(#{devCode})
+    </sql>
 
+    <select id="getSensorCodeByDevCode" resultType="String">
         SELECT b.SENSORCODE AS SENSORCODE
         FROM base_sensor b
         LEFT JOIN bus_device d ON b.DEVICE_TYPE=d.DEVICE_TYPE
-        WHERE d.VALID=1
-
+        WHERE d.VALID = 1
         <!--<if test="devCode != null and devCode !=''">-->
         and d.DEVCODE =
         <include refid="devCode_sql"/>
         <!--</if>-->
     </select>
 
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 5909c53..9cde3cc 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -12,7 +12,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEPTID AS deptid, USER AS user, NUM AS num
+        ID AS id, DEPTID AS deptid, user_id AS userId, NUM AS num
     </sql>
 
     <select id="selectDeptUserList" resultType="com.casic.missiles.modular.dept.dto.DeptUserView">
@@ -25,7 +25,7 @@
             version,
             num,
             tips,
-            user,
+            userId,
             userName,
             phone
          FROM dept_user_view

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index c26b3b7..f4a17d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -26,18 +26,19 @@
     <sql id="devCode_sql" databaseId="mysql">
         CONCAT(#{devCode})
     </sql>
-    <select id="getSensorCodeByDevCode" resultType="String">
+    <sql id="devCode_sql" databaseId="pgsql">
+        CONCAT(#{devCode})
+    </sql>
 
+    <select id="getSensorCodeByDevCode" resultType="String">
         SELECT b.SENSORCODE AS SENSORCODE
         FROM base_sensor b
         LEFT JOIN bus_device d ON b.DEVICE_TYPE=d.DEVICE_TYPE
-        WHERE d.VALID=1
-
+        WHERE d.VALID = 1
         <!--<if test="devCode != null and devCode !=''">-->
         and d.DEVCODE =
         <include refid="devCode_sql"/>
         <!--</if>-->
     </select>
 
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 5909c53..9cde3cc 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -12,7 +12,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEPTID AS deptid, USER AS user, NUM AS num
+        ID AS id, DEPTID AS deptid, user_id AS userId, NUM AS num
     </sql>
 
     <select id="selectDeptUserList" resultType="com.casic.missiles.modular.dept.dto.DeptUserView">
@@ -25,7 +25,7 @@
             version,
             num,
             tips,
-            user,
+            userId,
             userName,
             phone
          FROM dept_user_view
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
index f547d4a..bc2be39 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
@@ -1,10 +1,5 @@
 package com.casic.missiles.modular.dept.dto;
 
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 /**
  * <p>
  * VIEW
@@ -54,7 +49,7 @@
     /**
      * 责任人用户ID
      */
-    private Long user;
+    private Long userId;
     /**
      * 名字
      */
@@ -64,9 +59,6 @@
      */
     private String phone;
 
-
-
-
     public Long getId() {
         return id;
     }
@@ -142,11 +134,11 @@
     }
 
     public Long getUser() {
-        return user;
+        return userId;
     }
 
-    public void setUser(Long user) {
-        this.user = user;
+    public void setUser(Long userId) {
+        this.userId = userId;
     }
 
     public String getUserName() {
@@ -165,7 +157,6 @@
         this.phone = phone;
     }
 
-
     @Override
     public String toString() {
         return "DeptUserView{" +
@@ -177,7 +168,7 @@
                 ", version=" + version +
                 ", num=" + num +
                 ", tips=" + tips +
-                ", user=" + user +
+                ", userId=" + userId +
                 ", userName=" + userName +
                 ", phone=" + phone +
                 "}";

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index c26b3b7..f4a17d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -26,18 +26,19 @@
     <sql id="devCode_sql" databaseId="mysql">
         CONCAT(#{devCode})
     </sql>
-    <select id="getSensorCodeByDevCode" resultType="String">
+    <sql id="devCode_sql" databaseId="pgsql">
+        CONCAT(#{devCode})
+    </sql>
 
+    <select id="getSensorCodeByDevCode" resultType="String">
         SELECT b.SENSORCODE AS SENSORCODE
         FROM base_sensor b
         LEFT JOIN bus_device d ON b.DEVICE_TYPE=d.DEVICE_TYPE
-        WHERE d.VALID=1
-
+        WHERE d.VALID = 1
         <!--<if test="devCode != null and devCode !=''">-->
         and d.DEVCODE =
         <include refid="devCode_sql"/>
         <!--</if>-->
     </select>
 
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 5909c53..9cde3cc 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -12,7 +12,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEPTID AS deptid, USER AS user, NUM AS num
+        ID AS id, DEPTID AS deptid, user_id AS userId, NUM AS num
     </sql>
 
     <select id="selectDeptUserList" resultType="com.casic.missiles.modular.dept.dto.DeptUserView">
@@ -25,7 +25,7 @@
             version,
             num,
             tips,
-            user,
+            userId,
             userName,
             phone
          FROM dept_user_view
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
index f547d4a..bc2be39 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
@@ -1,10 +1,5 @@
 package com.casic.missiles.modular.dept.dto;
 
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 /**
  * <p>
  * VIEW
@@ -54,7 +49,7 @@
     /**
      * 责任人用户ID
      */
-    private Long user;
+    private Long userId;
     /**
      * 名字
      */
@@ -64,9 +59,6 @@
      */
     private String phone;
 
-
-
-
     public Long getId() {
         return id;
     }
@@ -142,11 +134,11 @@
     }
 
     public Long getUser() {
-        return user;
+        return userId;
     }
 
-    public void setUser(Long user) {
-        this.user = user;
+    public void setUser(Long userId) {
+        this.userId = userId;
     }
 
     public String getUserName() {
@@ -165,7 +157,6 @@
         this.phone = phone;
     }
 
-
     @Override
     public String toString() {
         return "DeptUserView{" +
@@ -177,7 +168,7 @@
                 ", version=" + version +
                 ", num=" + num +
                 ", tips=" + tips +
-                ", user=" + user +
+                ", userId=" + userId +
                 ", userName=" + userName +
                 ", phone=" + phone +
                 "}";
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 0644151..b3b8281 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -74,11 +74,6 @@
             <version>${pro.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
             <version>${extension.version}</version>
@@ -158,6 +153,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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 36e65a7..bd5ec10 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
@@ -127,7 +127,7 @@
     </select>
 
     <select id="getUserByDept" resultType="java.lang.Long">
-        SELECT USER FROM bus_dept_user
+        SELECT USER_ID as userId FROM bus_dept_user
         WHERE DEPTID = #{deptid}
     </select>
 </mapper>
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 ab1a15e..ca4e201 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
@@ -20,21 +20,32 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+            (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+            (INSTALLDATE,'yyyy-MM-dd')
+    </sql>
+    <sql id="installdate_toChar" databaseId="pgsql">
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="selectDevicesByConfig" resultType="com.casic.missiles.modular.system.dto.DeviceCodeSelectDto"
@@ -96,34 +107,49 @@
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="logTime_toChar" databaseId="pgsql">
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
+
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+            (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
+    <sql id="upTime_toChar" databaseId="pgsql">
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
+    </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||#{keywords}||'%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
     </sql>
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
-
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
-
-
+    <sql id="begintime_sql" databaseId="pgsql">
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
+    <sql id="endtime_sql" databaseId="pgsql">
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
+    </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
@@ -165,7 +191,8 @@
                lngGaode
         FROM device_overview_view
         WHERE valid = 1
-          and id = #{id} limit 1
+          and id = #{id}
+        limit 1
     </select>
     <sql id="DeviceInWellInfo_Column_List">
         d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index c26b3b7..f4a17d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -26,18 +26,19 @@
     <sql id="devCode_sql" databaseId="mysql">
         CONCAT(#{devCode})
     </sql>
-    <select id="getSensorCodeByDevCode" resultType="String">
+    <sql id="devCode_sql" databaseId="pgsql">
+        CONCAT(#{devCode})
+    </sql>
 
+    <select id="getSensorCodeByDevCode" resultType="String">
         SELECT b.SENSORCODE AS SENSORCODE
         FROM base_sensor b
         LEFT JOIN bus_device d ON b.DEVICE_TYPE=d.DEVICE_TYPE
-        WHERE d.VALID=1
-
+        WHERE d.VALID = 1
         <!--<if test="devCode != null and devCode !=''">-->
         and d.DEVCODE =
         <include refid="devCode_sql"/>
         <!--</if>-->
     </select>
 
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 5909c53..9cde3cc 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -12,7 +12,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEPTID AS deptid, USER AS user, NUM AS num
+        ID AS id, DEPTID AS deptid, user_id AS userId, NUM AS num
     </sql>
 
     <select id="selectDeptUserList" resultType="com.casic.missiles.modular.dept.dto.DeptUserView">
@@ -25,7 +25,7 @@
             version,
             num,
             tips,
-            user,
+            userId,
             userName,
             phone
          FROM dept_user_view
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
index f547d4a..bc2be39 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dto/DeptUserView.java
@@ -1,10 +1,5 @@
 package com.casic.missiles.modular.dept.dto;
 
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 /**
  * <p>
  * VIEW
@@ -54,7 +49,7 @@
     /**
      * 责任人用户ID
      */
-    private Long user;
+    private Long userId;
     /**
      * 名字
      */
@@ -64,9 +59,6 @@
      */
     private String phone;
 
-
-
-
     public Long getId() {
         return id;
     }
@@ -142,11 +134,11 @@
     }
 
     public Long getUser() {
-        return user;
+        return userId;
     }
 
-    public void setUser(Long user) {
-        this.user = user;
+    public void setUser(Long userId) {
+        this.userId = userId;
     }
 
     public String getUserName() {
@@ -165,7 +157,6 @@
         this.phone = phone;
     }
 
-
     @Override
     public String toString() {
         return "DeptUserView{" +
@@ -177,7 +168,7 @@
                 ", version=" + version +
                 ", num=" + num +
                 ", tips=" + tips +
-                ", user=" + user +
+                ", userId=" + userId +
                 ", userName=" + userName +
                 ", phone=" + phone +
                 "}";
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 0644151..b3b8281 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -74,11 +74,6 @@
             <version>${pro.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
             <version>${extension.version}</version>
@@ -158,6 +153,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 8870fcf..8183282 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: dev
+    active: postgre
   servlet:
     multipart:
       max-file-size: 50MB