1、数据库PG切换为达梦的修改版本。

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/DeviceReceiveLogMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.common.mapper.DeviceReceiveLogMapper">
@@ -26,10 +26,10 @@
             receive_time_str,
             syslog_message
         ) VALUES (
-            COALESCE(#{createdAt}, NOW() AT TIME ZONE 'utc'),
+            COALESCE(#{createdAt}, SYSDATE),
             #{deviceCollectId},
             #{deviceId},
-            #{deviceIp}::inet,
+            #{deviceIp},
             #{receiveTime},
             #{receiveTimeStr},
             #{syslogMessage}
@@ -49,10 +49,10 @@
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-            COALESCE(#{item.createdAt}, NOW() AT TIME ZONE 'utc'),
+            COALESCE(#{item.createdAt}, SYSDATE),
             #{item.deviceCollectId},
             #{item.deviceId},
-            #{item.deviceIp}::inet,
+            #{item.deviceIp},
             #{item.receiveTime},
             #{item.receiveTimeStr},
             #{item.syslogMessage}
@@ -80,10 +80,10 @@
         ORDER BY receive_time DESC
     </select>
 
-    <!-- 根据IP地址查询（使用PostgreSQL的inet操作符） -->
+    <!-- 根据IP地址查询（） -->
     <select id="selectByDeviceIp" resultMap="BaseResultMap">
         SELECT * FROM device_receive_log
-        WHERE device_ip >>= #{deviceIp}::inet
+        WHERE device_ip = #{deviceIp}
         ORDER BY receive_time DESC
     </select>
 
@@ -105,7 +105,7 @@
                 AND device_collect_id = #{deviceCollectId}
             </if>
             <if test="deviceIp != null and deviceIp != ''">
-                AND device_ip >>= #{deviceIp}::inet
+                AND device_ip = #{deviceIp}
             </if>
             <if test="receiveTime != null">
                 AND receive_time >= #{receiveTime}
@@ -128,7 +128,7 @@
                 AND device_collect_id = #{deviceCollectId}
             </if>
             <if test="deviceIp != null and deviceIp != ''">
-                AND device_ip >>= #{deviceIp}::inet
+                AND device_ip = #{deviceIp}
             </if>
             <if test="receiveTime != null">
                 AND receive_time >= #{receiveTime}