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

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisAnalysisRuleMapper.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.AnalysisAnalysisRuleMapper">
 
@@ -53,7 +53,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_analysis_rule
-        WHERE rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id =#{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
     </select>
 
@@ -62,7 +62,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_analysis_rule
-        WHERE rule_id = #{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id = #{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
     </select>
 
@@ -70,11 +70,11 @@
     <update id="updateTaskStatus">
         UPDATE analysis_analysis_rule
         SET task_status = #{taskStatus},
-            update_time = NOW()
+            update_time = SYSDATE
         <if test="updateBy != null">
             ,update_by = #{updateBy}
         </if>
-        WHERE rule_id = #{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id = #{ruleId, jdbcType=OTHER}
     </update>
 
 </mapper>

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisFieldMapper.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.AnalysisFieldMapper">
 
@@ -42,7 +42,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_field
-        WHERE rule_id = #{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id = #{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
         ORDER BY id ASC
     </select>
@@ -52,7 +52,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_field
-        WHERE rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id =#{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
         AND type IN ('measure', 'calc')
         ORDER BY id ASC
@@ -63,7 +63,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_field
-        WHERE rule_id = #{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id = #{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
         AND type = 'dimension'
         ORDER BY id ASC

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisFilterMapper.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.AnalysisFilterMapper">
 
@@ -13,9 +13,9 @@
         <result column="column_desc" property="columnDesc" jdbcType="VARCHAR"/>
         <result column="data_type" property="dataType" jdbcType="VARCHAR"/>
         <result column="fn" property="fn" jdbcType="VARCHAR"/>
-        <result column="arguments" property="arguments" jdbcType="OTHER"/>
+        <result column="arguments" property="arguments" jdbcType="VARCHAR"/>
         <result column="operator" property="operator" jdbcType="VARCHAR"/>
-        <result column="value" property="value" jdbcType="OTHER"/>
+        <result column="value" property="value" jdbcType="VARCHAR"/>
         <result column="base_type" property="baseType" jdbcType="INTEGER"/>
         <result column="category_id" property="categoryId" jdbcType="INTEGER"/>
         <result column="create_dept" property="createDept" jdbcType="BIGINT"/>
@@ -42,7 +42,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_filter
-        WHERE rule_id  =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id  =#{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
     </select>
 

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisGroupByColumnMapper.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.AnalysisGroupByColumnMapper">
 
@@ -44,7 +44,7 @@
         create_time, update_time, create_by, update_by, remark,
         tenant_id, rule_id, group_id, field_id, sort
         FROM analysis_group_by_column
-        WHERE rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id =#{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
         ORDER BY sort ASC
     </select>

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisGroupByHavingMapper.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.AnalysisGroupByHavingMapper">
 
@@ -13,9 +13,9 @@
         <result column="column_desc" property="columnDesc" jdbcType="VARCHAR"/>
         <result column="data_type" property="dataType" jdbcType="VARCHAR"/>
         <result column="fn" property="fn" jdbcType="VARCHAR"/>
-        <result column="arguments" property="arguments" jdbcType="OTHER"/>
+        <result column="arguments" property="arguments" jdbcType="VARCHAR"/>
         <result column="operator" property="operator" jdbcType="VARCHAR"/>
-        <result column="value" property="value" jdbcType="OTHER"/>
+        <result column="value" property="value" jdbcType="VARCHAR"/>
         <result column="base_type" property="baseType" jdbcType="INTEGER"/>
         <result column="category_id" property="categoryId" jdbcType="INTEGER"/>
         <result column="create_dept" property="createDept" jdbcType="BIGINT"/>
@@ -53,7 +53,7 @@
         h.update_time, h.create_by, h.update_by, h.remark, h.tenant_id
         FROM analysis_group_by_having h
         INNER JOIN analysis_group_by g ON h.group_by_id = g.id
-        WHERE g.rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE g.rule_id =#{ruleId, jdbcType=OTHER}
         AND h.del_flag = '0'
         AND g.del_flag = '0'
         ORDER BY h.id ASC

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

@@ -1,10 +1,10 @@
-<?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.AnalysisGroupByMapper">
 
     <resultMap id="BaseResultMap" type="com.common.entity.AnalysisGroupBy">
         <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="rule_id" property="ruleId" jdbcType="OTHER"/>
+        <result column="rule_id" property="ruleId" jdbcType="VARCHAR"/>
         <result column="group_type" property="groupType" jdbcType="INTEGER"/>
         <result column="window_type" property="windowType" jdbcType="VARCHAR"/>
         <result column="create_dept" property="createDept" jdbcType="BIGINT"/>
@@ -33,7 +33,7 @@
         SELECT
             <include refid="Base_Column_List"/>
         FROM analysis_group_by
-        WHERE rule_id = #{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id = #{ruleId, jdbcType=OTHER}
           AND del_flag = '0'
     </select>
 

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisTaskHistoryMapper.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.AnalysisTaskHistoryMapper">
 
@@ -33,7 +33,7 @@
         INSERT INTO analysis_task_history (
         <include refid="Base_Column_List"/>
         ) VALUES (
-        #{id}, #{ruleId}::uuid, #{startTime}, #{endTime}, #{durationTime}, #{progressPercent},
+        #{id}, #{ruleId}, #{startTime}, #{endTime}, #{durationTime}, #{progressPercent},
         #{inputCount}, #{outputCount}, #{status}, #{createDept}, #{delFlag},
         #{createTime}, #{updateTime}, #{createBy}, #{updateBy}, #{remark}, #{tenantId}
         )
@@ -48,7 +48,7 @@
         input_count = #{inputCount},
         output_count = #{outputCount},
         status = #{status},
-        update_time = NOW()
+        update_time = SYSDATE
         <if test="remark != null">
             ,remark = #{remark}
         </if>
@@ -60,7 +60,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_task_history
-        WHERE rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id =#{ruleId, jdbcType=OTHER}
         AND del_flag = '0'
         ORDER BY create_time DESC
         <if test="limit != null and limit > 0">
@@ -73,7 +73,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_task_history
-        WHERE rule_id =#{ruleId, jdbcType=OTHER}::uuid
+        WHERE rule_id =#{ruleId, jdbcType=OTHER}
         AND status = #{status}
         AND del_flag = '0'
         ORDER BY create_time DESC

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/AnalysisWhereConditionMapper.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.AnalysisWhereConditionMapper">
 
@@ -29,7 +29,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_where_condition
-        WHERE rule_id = #{ruleId}::uuid
+        WHERE rule_id = #{ruleId}
         AND del_flag = '0'
         ORDER BY seq_num ASC
     </select>
@@ -39,7 +39,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM analysis_where_condition
-        WHERE rule_id = #{ruleId}::uuid
+        WHERE rule_id = #{ruleId}
         AND (parent_cond_id IS NULL OR parent_cond_id = 0)
         AND del_flag = '0'
         ORDER BY seq_num ASC

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/DeviceDeviceMapper.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">
 
@@ -46,11 +46,11 @@
 
     <!-- 基础查询列 -->
     <sql id="Base_Column_List">
-        id, created_at::timestamp , updated_at::timestamp, deleted_at::timestamp, name, ip, device_group, device_type,
-        vendor, product_name, organization_id, last_receive_time::timestamp, agent_id, detail_id,
-        control_agent_id, license_start_time::timestamp, license_end_time::timestamp, is_monitoring,
+        id, created_at , updated_at, deleted_at, name, ip, device_group, device_type,
+        vendor, product_name, organization_id, last_receive_time, agent_id, detail_id,
+        control_agent_id, license_start_time, license_end_time, is_monitoring,
         security_scope_id, owner_id, ssh_config_id, status, created_by_id, decode_type,
-        miss_policy, tenant_id, create_time::timestamp, update_time::timestamp, create_by, update_by, del_flag,
+        miss_policy, tenant_id, create_time, update_time, create_by, update_by, del_flag,
         manager_name, today_parse_count, today_non_log_count, create_dept, device_collect_id
     </sql>
 

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}

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/DmColumnMapper.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">
 
@@ -65,13 +65,13 @@
 
 
     <select id="findById" parameterType="java.lang.Long" resultMap="BaseResultMap">
-         SELECT Id, created_at::timestamp as created_at ,
-          updated_at::timestamp as updated_at , deleted_at::timestamp as deleted_at , name, display_name,
+         SELECT Id, created_at as created_at ,
+          updated_at as updated_at , deleted_at as deleted_at , name, display_name,
         storage_data_type, business_data_type, is_built_in, is_hidden,
         is_not_normalizable, is_required, category_id, custom_asset_category_id,
         is_virtual, table_id, asset_table_id, column_set_id, base_type,
-        user_task_id, created_by_id, create_dept, create_by, create_time::timestamp as create_time ,
-        update_by, update_time::timestamp as update_time
+        user_task_id, created_by_id, create_dept, create_by, create_time as create_time ,
+        update_by, update_time as update_time
          FROM dm_column
         WHERE   id = #{id} AND deleted_at IS NULL
     </select>
@@ -80,13 +80,13 @@
     <!-- 查询全部正常字段-->
 
     <select id="selectAllNormal" parameterType="java.lang.Long" resultType="java.util.LinkedHashMap">
-     SELECT Id, created_at::timestamp as created_at ,
-          updated_at::timestamp as updated_at , deleted_at::timestamp as deleted_at , name, display_name,
+     SELECT Id, created_at as created_at ,
+          updated_at as updated_at , deleted_at as deleted_at , name, display_name,
         storage_data_type, business_data_type, is_built_in, is_hidden,
         is_not_normalizable, is_required, category_id, custom_asset_category_id,
         is_virtual, table_id, asset_table_id, column_set_id, base_type,
-        user_task_id, created_by_id, create_dept, create_by, create_time::timestamp as create_time ,
-        update_by, update_time::timestamp as update_time
+        user_task_id, created_by_id, create_dept, create_by, create_time as create_time ,
+        update_by, update_time as update_time
          FROM dm_column
     where  deleted_at is  null and id  in ( select  distinct column_id  from dm_field_table_column  where   deleted_at is null
     )

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/DmNormalizeRuleMapper.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.DmNormalizeRuleMapper">
 
@@ -16,7 +16,7 @@
         <result column="data_type" property="dataType" />
         <result column="field_cate_id" property="fieldCateId" />
         <result column="log_parsed" property="logParsed" />
-        <result column="sample_logs" property="sampleLogs" typeHandler="org.apache.ibatis.type.ArrayTypeHandler" />
+        <result column="sample_logs" property="sampleLogs" typeHandler="com.Modules.etl.handler.ArrayStringTypeHandler" />
         <result column="is_data_merge_enabled" property="isDataMergeEnabled" />
         <result column="data_merge_interval" property="dataMergeInterval" />
         <result column="data_merge_time_unit" property="dataMergeTimeUnit" />
@@ -51,12 +51,12 @@
 
         SELECT
         id,
-        created_at::timestamp as created_at,  <!-- 转换为 timestamp -->
-        updated_at::timestamp as updated_at,
-        deleted_at::timestamp as deleted_at,
-        first_data_saved_at::timestamp as first_data_saved_at,
-        create_time::timestamp as create_time,
-        update_time::timestamp as update_time,
+        created_at as created_at,  
+        updated_at as updated_at,
+        deleted_at as deleted_at,
+        first_data_saved_at as first_data_saved_at,
+        create_time as create_time,
+        update_time as update_time,
         name, display_name, description, is_built_in, is_running,
         data_type, field_cate_id, log_parsed, sample_logs,
         is_data_merge_enabled, data_merge_interval, data_merge_time_unit,
@@ -74,12 +74,12 @@
 
         SELECT
         id,
-        created_at::timestamp as created_at,  <!-- 转换为 timestamp -->
-        updated_at::timestamp as updated_at,
-        deleted_at::timestamp as deleted_at,
-        first_data_saved_at::timestamp as first_data_saved_at,
-        create_time::timestamp as create_time,
-        update_time::timestamp as update_time,
+        created_at as created_at,  
+        updated_at as updated_at,
+        deleted_at as deleted_at,
+        first_data_saved_at as first_data_saved_at,
+        create_time as create_time,
+        update_time as update_time,
         name, display_name, description, is_built_in, is_running,
         data_type, field_cate_id, log_parsed, sample_logs,
         is_data_merge_enabled, data_merge_interval, data_merge_time_unit,
@@ -113,7 +113,7 @@
             <if test="dataType != null">data_type = #{dataType},</if>
             <if test="fieldCateId != null">field_cate_id = #{fieldCateId},</if>
             <if test="logParsed != null">log_parsed = #{logParsed},</if>
-            <if test="sampleLogs != null">sample_logs = #{sampleLogs, typeHandler=org.apache.ibatis.type.ArrayTypeHandler},</if>
+            <if test="sampleLogs != null">sample_logs = #{sampleLogs, typeHandler=com.Modules.etl.handler.ArrayStringTypeHandler},</if>
             <if test="isDataMergeEnabled != null">is_data_merge_enabled = #{isDataMergeEnabled},</if>
             <if test="dataMergeInterval != null">data_merge_interval = #{dataMergeInterval},</if>
             <if test="dataMergeTimeUnit != null">data_merge_time_unit = #{dataMergeTimeUnit},</if>
@@ -142,7 +142,7 @@
             <if test="dataType != null">data_type = #{dataType},</if>
             <if test="fieldCateId != null">field_cate_id = #{fieldCateId},</if>
             <if test="logParsed != null">log_parsed = #{logParsed},</if>
-            <if test="sampleLogs != null">sample_logs = #{sampleLogs, typeHandler=org.apache.ibatis.type.ArrayTypeHandler},</if>
+            <if test="sampleLogs != null">sample_logs = #{sampleLogs, typeHandler=com.Modules.etl.handler.ArrayStringTypeHandler},</if>
             <if test="isDataMergeEnabled != null">is_data_merge_enabled = #{isDataMergeEnabled},</if>
             <if test="dataMergeInterval != null">data_merge_interval = #{dataMergeInterval},</if>
             <if test="dataMergeTimeUnit != null">data_merge_time_unit = #{dataMergeTimeUnit},</if>

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/SyslogNonNormalMessageMapper.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.SyslogNonNormalMessageMapper">
 
@@ -118,7 +118,7 @@
         WHERE del_flag = '0'
         AND (
         <foreach collection="ids" item="id" index="index" separator=" OR ">
-            (id = #{id} AND created_at = #{createdAts[${index}]}::timestamptz)
+            (id = #{id} AND created_at = #{createdAts[${index}]}tz)
         </foreach>
         )
     </select>
@@ -137,7 +137,7 @@
     <update id="updateBatchDelFlag">
         UPDATE syslog_non_normal_message
         SET del_flag = '1',
-        update_time = NOW()
+        update_time = SYSDATE
         WHERE id IN
         <foreach collection="messages" item="item" open="(" separator="," close=")">
             #{item.id}

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/SyslogNormalAlarmMapper.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.SyslogNormalAlarmMapper">
@@ -406,9 +406,9 @@
             <if test="dataMap.container_name != null">#{dataMap.container_name},</if>
             <if test="dataMap.container_id != null">#{dataMap.container_id},</if>
             <if test="dataMap.http_resp_server != null">#{dataMap.http_resp_server},</if>
-            <if test="dataMap.srcip_id != null">#{dataMap.srcip_id}::int8,</if>
-            <if test="dataMap.cdnip != null">#{dataMap.cdnip}::inet,</if>
-            <if test="dataMap.natip != null">#{dataMap.natip}::inet,</if>
+            <if test="dataMap.srcip_id != null">#{dataMap.srcip_id},</if>
+            <if test="dataMap.cdnip != null">#{dataMap.cdnip},</if>
+            <if test="dataMap.natip != null">#{dataMap.natip},</if>
             <if test="dataMap.mail_sender != null">#{dataMap.mail_sender},</if>
             <if test="dataMap.mail_receiver != null">#{dataMap.mail_receiver},</if>
             <if test="dataMap.vpn_mac != null">#{dataMap.vpn_mac},</if>
@@ -439,8 +439,8 @@
             <if test="dataMap.print_time != null">#{dataMap.print_time},</if>
             <if test="dataMap.printer != null">#{dataMap.printer},</if>
             <if test="dataMap.printer_type != null">#{dataMap.printer_type},</if>
-            <if test="dataMap.print_pages != null">#{dataMap.print_pages}::int8,</if>
-            <if test="dataMap.print_copies != null">#{dataMap.print_copies}::int8,</if>
+            <if test="dataMap.print_pages != null">#{dataMap.print_pages},</if>
+            <if test="dataMap.print_copies != null">#{dataMap.print_copies},</if>
             <if test="dataMap.src_device != null">#{dataMap.src_device},</if>
             <if test="dataMap.dst_device != null">#{dataMap.dst_device},</if>
             <if test="dataMap.src_file != null">#{dataMap.src_file},</if>
@@ -457,18 +457,18 @@
             <if test="dataMap.env != null">#{dataMap.env},</if>
             <if test="dataMap.brute_force_service != null">#{dataMap.brute_force_service},</if>
             <if test="dataMap.vuirs_name != null">#{dataMap.vuirs_name},</if>
-            <if test="dataMap.http_req_length != null">#{dataMap.http_req_length}::int8,</if>
+            <if test="dataMap.http_req_length != null">#{dataMap.http_req_length},</if>
             <if test="dataMap.http_req_content_type != null">#{dataMap.http_req_content_type},</if>
-            <if test="dataMap.tc_scan_port != null">#{dataMap.tc_scan_port}::inet,</if>
-            <if test="dataMap.tc_labels != null">#{dataMap.tc_labels}::inet,</if>
+            <if test="dataMap.tc_scan_port != null">#{dataMap.tc_scan_port},</if>
+            <if test="dataMap.tc_labels != null">#{dataMap.tc_labels},</if>
             <if test="dataMap.http_resp_content_type != null">#{dataMap.http_resp_content_type},</if>
             <if test="dataMap.dns_msg_type != null">#{dataMap.dns_msg_type},</if>
             <if test="dataMap.dns_answer_length != null">#{dataMap.dns_answer_length},</if>
             <if test="dataMap.dns_ioc != null">#{dataMap.dns_ioc},</if>
-            <if test="dataMap.tx_bytes != null">#{dataMap.tx_bytes}::double precision,</if>
-            <if test="dataMap.rx_bytes != null">#{dataMap.rx_bytes}::double precision,</if>
-            <if test="dataMap.all_bytes != null">#{dataMap.all_bytes}::double precision,</if>
-            <if test="dataMap.duration_time != null">#{dataMap.duration_time}::int8,</if>
+            <if test="dataMap.tx_bytes != null">#{dataMap.tx_bytes},</if>
+            <if test="dataMap.rx_bytes != null">#{dataMap.rx_bytes},</if>
+            <if test="dataMap.all_bytes != null">#{dataMap.all_bytes},</if>
+            <if test="dataMap.duration_time != null">#{dataMap.duration_time},</if>
             <if test="dataMap.mail_attach_name != null">#{dataMap.mail_attach_name},</if>
             <if test="dataMap.mail_subject != null">#{dataMap.mail_subject},</if>
             <if test="dataMap.mail_message != null">#{dataMap.mail_message},</if>
@@ -488,27 +488,27 @@
             <if test="dataMap.src_ip_apt != null">#{dataMap.src_ip_apt},</if>
             <if test="dataMap.srcip_name != null">#{dataMap.srcip_name},</if>
             <if test="dataMap.tc_client != null">#{dataMap.tc_client},</if>
-            <if test="dataMap.srcip_organization_id != null">#{dataMap.srcip_organization_id}::int8,</if>
+            <if test="dataMap.srcip_organization_id != null">#{dataMap.srcip_organization_id},</if>
             <if test="dataMap.dest_ip_intranetip != null">#{dataMap.dest_ip_intranetip},</if>
             <if test="dataMap.dest_ip_ioc != null">#{dataMap.dest_ip_ioc},</if>
-            <if test="dataMap.desip_id != null">#{dataMap.desip_id}::int8,</if>
+            <if test="dataMap.desip_id != null">#{dataMap.desip_id},</if>
             <if test="dataMap.desip_name != null">#{dataMap.desip_name},</if>
-            <if test="dataMap.tc_hostip != null">#{dataMap.tc_hostip}::inet,</if>
-            <if test="dataMap.desip_organization_id != null">#{dataMap.desip_organization_id}::int8,</if>
+            <if test="dataMap.tc_hostip != null">#{dataMap.tc_hostip},</if>
+            <if test="dataMap.desip_organization_id != null">#{dataMap.desip_organization_id},</if>
             <if test="dataMap.origin_confidence != null">#{dataMap.origin_confidence},</if>
             <if test="dataMap.origin_malscore != null">#{dataMap.origin_malscore},</if>
             <if test="dataMap.attacker_icampaign != null">#{dataMap.attacker_icampaign},</if>
-            <if test="dataMap.attacker_host_asset_id != null">#{dataMap.attacker_host_asset_id}::int8,</if>
-            <if test="dataMap.attacker_organization_id != null">#{dataMap.attacker_organization_id}::int8,</if>
-            <if test="dataMap.victim_host_asset_id != null">#{dataMap.victim_host_asset_id}::int8,</if>
-            <if test="dataMap.victim_organization_id != null">#{dataMap.victim_organization_id}::int8,</if>
+            <if test="dataMap.attacker_host_asset_id != null">#{dataMap.attacker_host_asset_id},</if>
+            <if test="dataMap.attacker_organization_id != null">#{dataMap.attacker_organization_id},</if>
+            <if test="dataMap.victim_host_asset_id != null">#{dataMap.victim_host_asset_id},</if>
+            <if test="dataMap.victim_organization_id != null">#{dataMap.victim_organization_id},</if>
             <if test="dataMap.logout_time != null">#{dataMap.logout_time},</if>
             <if test="dataMap.http_req_line != null">#{dataMap.http_req_line},</if>
             <if test="dataMap.desip_security_scope_id != null">#{dataMap.desip_security_scope_id},</if>
             <if test="dataMap.srcip_security_scope_id != null">#{dataMap.srcip_security_scope_id},</if>
-            <if test="dataMap.http_resp_length != null">#{dataMap.http_resp_length}::int8,</if>
+            <if test="dataMap.http_resp_length != null">#{dataMap.http_resp_length},</if>
             <if test="dataMap.tc_attack_type != null">#{dataMap.tc_attack_type},</if>
-            <if test="dataMap.tc_realip != null">#{dataMap.tc_realip}::inet,</if>
+            <if test="dataMap.tc_realip != null">#{dataMap.tc_realip},</if>
             <if test="dataMap.attacker_ip_lists != null">#{dataMap.attacker_ip_lists},</if>
             <if test="dataMap.login_password != null">#{dataMap.login_password},</if>
             <if test="dataMap.detail != null">#{dataMap.detail},</if>
@@ -525,12 +525,12 @@
             <if test="dataMap.login_abnormal_type != null">#{dataMap.login_abnormal_type},</if>
             <if test="dataMap.file_tag != null">#{dataMap.file_tag},</if>
             <if test="dataMap.file_platform != null">#{dataMap.file_platform},</if>
-            <if test="dataMap.target_ip != null">#{dataMap.target_ip}::inet,</if>
+            <if test="dataMap.target_ip != null">#{dataMap.target_ip},</if>
             <if test="dataMap.collect_date != null">#{dataMap.collect_date},</if>
-            <if test="dataMap.tc_client_ip != null">#{dataMap.tc_client_ip}::inet,</if>
-            <if test="dataMap.tc_server_ip != null">#{dataMap.tc_server_ip}::inet,</if>
-            <if test="dataMap.tc_externalip != null">#{dataMap.tc_externalip}::inet,</if>
-            <if test="dataMap.http_status_code != null">#{dataMap.http_status_code}::int8,</if>
+            <if test="dataMap.tc_client_ip != null">#{dataMap.tc_client_ip},</if>
+            <if test="dataMap.tc_server_ip != null">#{dataMap.tc_server_ip},</if>
+            <if test="dataMap.tc_externalip != null">#{dataMap.tc_externalip},</if>
+            <if test="dataMap.http_status_code != null">#{dataMap.http_status_code},</if>
             <if test="dataMap.device_domian != null">#{dataMap.device_domian},</if>
             <if test="dataMap.src_ip_str != null">#{dataMap.src_ip_str},</if>
             <if test="dataMap.src_port_str != null">#{dataMap.src_port_str},</if>
@@ -576,28 +576,28 @@
             <if test="dataMap.origin_agent_name != null">#{dataMap.origin_agent_name},</if>
             <if test="dataMap.origin_work_group != null">#{dataMap.origin_work_group},</if>
             <if test="dataMap.origin_asset_group != null">#{dataMap.origin_asset_group},</if>
-            <if test="dataMap.origin_local_port != null">#{dataMap.origin_local_port}::int8,</if>
-            <if test="dataMap.origin_agent_ip != null">#{dataMap.origin_agent_ip}::inet,</if>
-            <if test="dataMap.origin_internal_ip != null">#{dataMap.origin_internal_ip}::inet,</if>
-            <if test="dataMap.origin_external_ip != null">#{dataMap.origin_external_ip}::inet,</if>
-            <if test="dataMap.origin_local_addr != null">#{dataMap.origin_local_addr}::inet,</if>
-            <if test="dataMap.agent_id != null">#{dataMap.agent_id}::int8,</if>
+            <if test="dataMap.origin_local_port != null">#{dataMap.origin_local_port},</if>
+            <if test="dataMap.origin_agent_ip != null">#{dataMap.origin_agent_ip},</if>
+            <if test="dataMap.origin_internal_ip != null">#{dataMap.origin_internal_ip},</if>
+            <if test="dataMap.origin_external_ip != null">#{dataMap.origin_external_ip},</if>
+            <if test="dataMap.origin_local_addr != null">#{dataMap.origin_local_addr},</if>
+            <if test="dataMap.agent_id != null">#{dataMap.agent_id},</if>
             <if test="dataMap.agent_name != null">#{dataMap.agent_name},</if>
             <if test="dataMap.tc_title != null">#{dataMap.tc_title},</if>
             <if test="dataMap.log_id != null">#{dataMap.log_id},</if>
             <if test="dataMap.event_date != null">#{dataMap.event_date},</if>
             <if test="dataMap.event_time_ts != null">#{dataMap.event_time_ts},</if>
-            <if test="dataMap.event_level != null">#{dataMap.event_level}::int ,</if>
-            <if test="dataMap.src_ip != null">#{dataMap.src_ip}::inet,</if>
-            <if test="dataMap.src_port != null">#{dataMap.src_port}::BIGINT ,</if>
-            <if test="dataMap.dest_ip != null">#{dataMap.dest_ip}::inet,</if>
+            <if test="dataMap.event_level != null">#{dataMap.event_level},</if>
+            <if test="dataMap.src_ip != null">#{dataMap.src_ip},</if>
+            <if test="dataMap.src_port != null">#{dataMap.src_port},</if>
+            <if test="dataMap.dest_ip != null">#{dataMap.dest_ip},</if>
             <if test="dataMap.dest_port != null">#{dataMap.dest_port}::BIGINT,</if>
             <if test="dataMap.event_time != null">#{dataMap.event_time},</if>
             <if test="dataMap.attacker_country != null">#{dataMap.attacker_country},</if>
             <if test="dataMap.src_mac != null">#{dataMap.src_mac},</if>
             <if test="dataMap.dest_mac != null">#{dataMap.dest_mac},</if>
             <if test="dataMap.proto != null">#{dataMap.proto},</if>
-            <if test="dataMap.dev_id != null">#{dataMap.dev_id}::int8,</if>
+            <if test="dataMap.dev_id != null">#{dataMap.dev_id},</if>
             <if test="dataMap.created_time != null">#{dataMap.created_time},</if>
             <if test="dataMap.src_country != null">#{dataMap.src_country},</if>
             <if test="dataMap.src_country_code != null">#{dataMap.src_country_code},</if>
@@ -621,20 +621,20 @@
             <if test="dataMap.end_time != null">#{dataMap.end_time},</if>
             <if test="dataMap.file_created_time != null">#{dataMap.file_created_time},</if>
             <if test="dataMap.file_modified_time != null">#{dataMap.file_modified_time},</if>
-            <if test="dataMap.tc_miguan_scan_port != null">#{dataMap.tc_miguan_scan_port}::inet,</if>
+            <if test="dataMap.tc_miguan_scan_port != null">#{dataMap.tc_miguan_scan_port},</if>
             <if test="dataMap.process_path != null">#{dataMap.process_path},</if>
             <if test="dataMap.parent_process_path != null">#{dataMap.parent_process_path},</if>
             <if test="dataMap.gname != null">#{dataMap.gname},</if>
             <if test="dataMap.exe_name != null">#{dataMap.exe_name},</if>
             <if test="dataMap.exe_path != null">#{dataMap.exe_path},</if>
             <if test="dataMap.login_time != null">#{dataMap.login_time},</if>
-            <if test="dataMap.login_times != null">#{dataMap.login_times}::int8,</if>
+            <if test="dataMap.login_times != null">#{dataMap.login_times},</if>
             <if test="dataMap.check_item != null">#{dataMap.check_item},</if>
             <if test="dataMap.check_type != null">#{dataMap.check_type},</if>
-            <if test="dataMap.attacker_ip != null">#{dataMap.attacker_ip}::inet,</if>
-            <if test="dataMap.attacker_port != null">#{dataMap.attacker_port}::int8,</if>
-            <if test="dataMap.victim_ip != null">#{dataMap.victim_ip}::inet,</if>
-            <if test="dataMap.victim_port != null">#{dataMap.victim_port}::int8,</if>
+            <if test="dataMap.attacker_ip != null">#{dataMap.attacker_ip},</if>
+            <if test="dataMap.attacker_port != null">#{dataMap.attacker_port},</if>
+            <if test="dataMap.victim_ip != null">#{dataMap.victim_ip},</if>
+            <if test="dataMap.victim_port != null">#{dataMap.victim_port},</if>
             <if test="dataMap.attacker_city != null">#{dataMap.attacker_city},</if>
             <if test="dataMap.attacker_lon != null">#{dataMap.attacker_lon},</if>
             <if test="dataMap.attacker_lat != null">#{dataMap.attacker_lat},</if>
@@ -660,7 +660,7 @@
             <if test="dataMap.file_ssdeep != null">#{dataMap.file_ssdeep},</if>
             <if test="dataMap.victim_country_code != null">#{dataMap.victim_country_code},</if>
             <if test="dataMap.http_xff_ip != null">#{dataMap.http_xff_ip},</if>
-            <if test="dataMap.tc_miguan_class != null">#{dataMap.tc_miguan_class}::inet,</if>
+            <if test="dataMap.tc_miguan_class != null">#{dataMap.tc_miguan_class},</if>
             <if test="dataMap.pid != null">#{dataMap.pid},</if>
             <if test="dataMap.ppid != null">#{dataMap.ppid},</if>
             <if test="dataMap.process_name != null">#{dataMap.process_name},</if>
@@ -687,35 +687,35 @@
             <if test="dataMap.dest_city != null">#{dataMap.dest_city},</if>
             <if test="dataMap.dest_lon != null">#{dataMap.dest_lon},</if>
             <if test="dataMap.dest_lat != null">#{dataMap.dest_lat},</if>
-            <if test="dataMap.event_category != null">#{dataMap.event_category}::int4,</if>
-            <if test="dataMap.attack_result != null">#{dataMap.attack_result}::int4,</if>
-            <if test="dataMap.probe_ip != null">#{dataMap.probe_ip}::inet,</if>
-            <if test="dataMap.device_ip != null">#{dataMap.device_ip}::inet,</if>
+            <if test="dataMap.event_category != null">#{dataMap.event_category},</if>
+            <if test="dataMap.attack_result != null">#{dataMap.attack_result},</if>
+            <if test="dataMap.probe_ip != null">#{dataMap.probe_ip},</if>
+            <if test="dataMap.device_ip != null">#{dataMap.device_ip},</if>
             <if test="dataMap.device_manufacturer != null">#{dataMap.device_manufacturer},</if>
             <if test="dataMap.device_name != null">#{dataMap.device_name},</if>
             <if test="dataMap.product_name != null">#{dataMap.product_name},</if>
             <if test="dataMap.__id != null">#{dataMap.__id},</if>
-            <if test="dataMap.__count != null">#{dataMap.__count}::int8,</if>
+            <if test="dataMap.__count != null">#{dataMap.__count},</if>
             <if test="dataMap.__count_reason != null">#{dataMap.__count_reason},</if>
-            <if test="dataMap.event_type != null">#{dataMap.event_type}::int,</if>
+            <if test="dataMap.event_type != null">#{dataMap.event_type},</if>
             <if test="dataMap.protocol != null">#{dataMap.protocol},</if>
             <if test="dataMap.shell_cmd != null">#{dataMap.shell_cmd},</if>
             <if test="dataMap.parent_name != null">#{dataMap.parent_name},</if>
             <if test="dataMap.host_file_path != null">#{dataMap.host_file_path},</if>
             <if test="dataMap.uid != null">#{dataMap.uid},</if>
-            <if test="dataMap.fall != null">#{dataMap.fall}::int4,</if>
-            <if test="dataMap.tc_miguan_server_ip != null">#{dataMap.tc_miguan_server_ip}::inet,</if>
-            <if test="dataMap.dev_type != null">#{dataMap.dev_type}::int4,</if>
-            <if test="dataMap.collect_method != null">#{dataMap.collect_method}::int4,</if>
-            <if test="dataMap.field_cate_id != null">#{dataMap.field_cate_id}::int4,</if>
-            <if test="dataMap.device_type != null">#{dataMap.device_type}::int4,</if>
-            <if test="dataMap.tc_miguan_client_ip != null">#{dataMap.tc_miguan_client_ip}::inet,</if>
-            <if test="dataMap.tc_miguan_name != null">#{dataMap.tc_miguan_name}::inet,</if>
-            <if test="dataMap.origin_total_packages != null">#{dataMap.origin_total_packages}::int8,</if>
-            <if test="dataMap.origin_total_bytes != null">#{dataMap.origin_total_bytes}::int8,</if>
-            <if test="dataMap.origin_peak_packages_rate != null">#{dataMap.origin_peak_packages_rate}::int8,</if>
-            <if test="dataMap.origin_peak_bytes_rate != null">#{dataMap.origin_peak_bytes_rate}::int8,</if>
-            <if test="dataMap.origin_peak_flows_rate != null">#{dataMap.origin_peak_flows_rate}::int8,</if>
+            <if test="dataMap.fall != null">#{dataMap.fall},</if>
+            <if test="dataMap.tc_miguan_server_ip != null">#{dataMap.tc_miguan_server_ip},</if>
+            <if test="dataMap.dev_type != null">#{dataMap.dev_type},</if>
+            <if test="dataMap.collect_method != null">#{dataMap.collect_method},</if>
+            <if test="dataMap.field_cate_id != null">#{dataMap.field_cate_id},</if>
+            <if test="dataMap.device_type != null">#{dataMap.device_type},</if>
+            <if test="dataMap.tc_miguan_client_ip != null">#{dataMap.tc_miguan_client_ip},</if>
+            <if test="dataMap.tc_miguan_name != null">#{dataMap.tc_miguan_name},</if>
+            <if test="dataMap.origin_total_packages != null">#{dataMap.origin_total_packages},</if>
+            <if test="dataMap.origin_total_bytes != null">#{dataMap.origin_total_bytes},</if>
+            <if test="dataMap.origin_peak_packages_rate != null">#{dataMap.origin_peak_packages_rate},</if>
+            <if test="dataMap.origin_peak_bytes_rate != null">#{dataMap.origin_peak_bytes_rate},</if>
+            <if test="dataMap.origin_peak_flows_rate != null">#{dataMap.origin_peak_flows_rate},</if>
             <if test="dataMap.apt_orgname != null">#{dataMap.apt_orgname},</if>
             <if test="dataMap.apt_orgmsg != null">#{dataMap.apt_orgmsg},</if>
             <if test="dataMap.mail_message_id != null">#{dataMap.mail_message_id},</if>
@@ -725,18 +725,18 @@
             <if test="dataMap.mail_url != null">#{dataMap.mail_url},</if>
             <if test="dataMap.mail_cc != null">#{dataMap.mail_cc},</if>
             <if test="dataMap.algorithm != null">#{dataMap.algorithm},</if>
-            <if test="dataMap.miningpool_ip != null">#{dataMap.miningpool_ip}::inet,</if>
+            <if test="dataMap.miningpool_ip != null">#{dataMap.miningpool_ip},</if>
             <if test="dataMap.process_md5 != null">#{dataMap.process_md5},</if>
             <if test="dataMap.pprocess_md5 != null">#{dataMap.pprocess_md5},</if>
             <if test="dataMap.source_servername != null">#{dataMap.source_servername},</if>
             <if test="dataMap.origin_source_servername != null">#{dataMap.origin_source_servername},</if>
             <if test="dataMap.mail_filename != null">#{dataMap.mail_filename},</if>
             <if test="dataMap.dst_upload_appname != null">#{dataMap.dst_upload_appname},</if>
-            <if test="dataMap.target_port != null">#{dataMap.target_port}::int8,</if>
+            <if test="dataMap.target_port != null">#{dataMap.target_port},</if>
             <if test="dataMap.gid != null">#{dataMap.gid},</if>
             <if test="dataMap.origin_uid != null">#{dataMap.origin_uid},</if>
             <if test="dataMap.origin_gid != null">#{dataMap.origin_gid},</if>
-            <if test="dataMap.target_ports != null">#{dataMap.target_ports}::int8,</if>
+            <if test="dataMap.target_ports != null">#{dataMap.target_ports},</if>
             <if test="dataMap.tc_miguan_name1 != null">#{dataMap.tc_miguan_name1},</if>
             <if test="dataMap.tc_miguan_class1 != null">#{dataMap.tc_miguan_class1},</if>
             <if test="dataMap.etl_time != null">#{dataMap.etl_time},</if>
@@ -744,7 +744,7 @@
             <if test="dataMap.desip_security_scope != null">#{dataMap.desip_security_scope},</if>
             <if test="dataMap.srcip_security_scope != null">#{dataMap.srcip_security_scope},</if>
             <if test="dataMap.collect_time_ts != null">#{dataMap.collect_time_ts},</if>
-            <if test="dataMap.tc_miguan_scan_port1 != null">#{dataMap.tc_miguan_scan_port1}::inet,</if>
+            <if test="dataMap.tc_miguan_scan_port1 != null">#{dataMap.tc_miguan_scan_port1},</if>
             <if test="dataMap.src_dev_name != null">#{dataMap.src_dev_name},</if>
             <if test="dataMap.collect_protocol != null">#{dataMap.collect_protocol},</if>
             <if test="dataMap.destination_system_type != null">#{dataMap.destination_system_type},</if>

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/SyslogNormalDataMapper.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.SyslogNormalDataMapper">
@@ -57,6 +57,7 @@
             id,
             created_at,
             log_time,
+            device_id,
             device_ip,
             dest_ip,
             dest_port,
@@ -103,6 +104,7 @@
             id,
             created_at,
             log_time,
+            device_id,
             device_ip,
             dest_ip,
             dest_port,
@@ -541,9 +543,9 @@
             <if test="dataMap.container_name != null">#{dataMap.container_name},</if>
             <if test="dataMap.container_id != null">#{dataMap.container_id},</if>
             <if test="dataMap.http_resp_server != null">#{dataMap.http_resp_server},</if>
-            <if test="dataMap.srcip_id != null">#{dataMap.srcip_id}::int8,</if>
-            <if test="dataMap.cdnip != null">#{dataMap.cdnip}::inet,</if>
-            <if test="dataMap.natip != null">#{dataMap.natip}::inet,</if>
+            <if test="dataMap.srcip_id != null">#{dataMap.srcip_id},</if>
+            <if test="dataMap.cdnip != null">#{dataMap.cdnip},</if>
+            <if test="dataMap.natip != null">#{dataMap.natip},</if>
             <if test="dataMap.mail_sender != null">#{dataMap.mail_sender},</if>
             <if test="dataMap.mail_receiver != null">#{dataMap.mail_receiver},</if>
             <if test="dataMap.vpn_mac != null">#{dataMap.vpn_mac},</if>
@@ -574,8 +576,8 @@
             <if test="dataMap.print_time != null">#{dataMap.print_time},</if>
             <if test="dataMap.printer != null">#{dataMap.printer},</if>
             <if test="dataMap.printer_type != null">#{dataMap.printer_type},</if>
-            <if test="dataMap.print_pages != null">#{dataMap.print_pages}::int8,</if>
-            <if test="dataMap.print_copies != null">#{dataMap.print_copies}::int8,</if>
+            <if test="dataMap.print_pages != null">#{dataMap.print_pages},</if>
+            <if test="dataMap.print_copies != null">#{dataMap.print_copies},</if>
             <if test="dataMap.src_device != null">#{dataMap.src_device},</if>
             <if test="dataMap.dst_device != null">#{dataMap.dst_device},</if>
             <if test="dataMap.src_file != null">#{dataMap.src_file},</if>
@@ -592,18 +594,18 @@
             <if test="dataMap.env != null">#{dataMap.env},</if>
             <if test="dataMap.brute_force_service != null">#{dataMap.brute_force_service},</if>
             <if test="dataMap.vuirs_name != null">#{dataMap.vuirs_name},</if>
-            <if test="dataMap.http_req_length != null">#{dataMap.http_req_length}::int8,</if>
+            <if test="dataMap.http_req_length != null">#{dataMap.http_req_length},</if>
             <if test="dataMap.http_req_content_type != null">#{dataMap.http_req_content_type},</if>
-            <if test="dataMap.tc_scan_port != null">#{dataMap.tc_scan_port}::inet,</if>
-            <if test="dataMap.tc_labels != null">#{dataMap.tc_labels}::inet,</if>
+            <if test="dataMap.tc_scan_port != null">#{dataMap.tc_scan_port},</if>
+            <if test="dataMap.tc_labels != null">#{dataMap.tc_labels},</if>
             <if test="dataMap.http_resp_content_type != null">#{dataMap.http_resp_content_type},</if>
             <if test="dataMap.dns_msg_type != null">#{dataMap.dns_msg_type},</if>
             <if test="dataMap.dns_answer_length != null">#{dataMap.dns_answer_length},</if>
             <if test="dataMap.dns_ioc != null">#{dataMap.dns_ioc},</if>
-            <if test="dataMap.tx_bytes != null">#{dataMap.tx_bytes}::double precision,</if>
-            <if test="dataMap.rx_bytes != null">#{dataMap.rx_bytes}::double precision,</if>
-            <if test="dataMap.all_bytes != null">#{dataMap.all_bytes}::double precision,</if>
-            <if test="dataMap.duration_time != null">#{dataMap.duration_time}::int8,</if>
+            <if test="dataMap.tx_bytes != null">#{dataMap.tx_bytes},</if>
+            <if test="dataMap.rx_bytes != null">#{dataMap.rx_bytes},</if>
+            <if test="dataMap.all_bytes != null">#{dataMap.all_bytes},</if>
+            <if test="dataMap.duration_time != null">#{dataMap.duration_time},</if>
             <if test="dataMap.mail_attach_name != null">#{dataMap.mail_attach_name},</if>
             <if test="dataMap.mail_subject != null">#{dataMap.mail_subject},</if>
             <if test="dataMap.mail_message != null">#{dataMap.mail_message},</if>
@@ -623,27 +625,27 @@
             <if test="dataMap.src_ip_apt != null">#{dataMap.src_ip_apt},</if>
             <if test="dataMap.srcip_name != null">#{dataMap.srcip_name},</if>
             <if test="dataMap.tc_client != null">#{dataMap.tc_client},</if>
-            <if test="dataMap.srcip_organization_id != null">#{dataMap.srcip_organization_id}::int8,</if>
+            <if test="dataMap.srcip_organization_id != null">#{dataMap.srcip_organization_id},</if>
             <if test="dataMap.dest_ip_intranetip != null">#{dataMap.dest_ip_intranetip},</if>
             <if test="dataMap.dest_ip_ioc != null">#{dataMap.dest_ip_ioc},</if>
-            <if test="dataMap.desip_id != null">#{dataMap.desip_id}::int8,</if>
+            <if test="dataMap.desip_id != null">#{dataMap.desip_id},</if>
             <if test="dataMap.desip_name != null">#{dataMap.desip_name},</if>
-            <if test="dataMap.tc_hostip != null">#{dataMap.tc_hostip}::inet,</if>
-            <if test="dataMap.desip_organization_id != null">#{dataMap.desip_organization_id}::int8,</if>
+            <if test="dataMap.tc_hostip != null">#{dataMap.tc_hostip},</if>
+            <if test="dataMap.desip_organization_id != null">#{dataMap.desip_organization_id},</if>
             <if test="dataMap.origin_confidence != null">#{dataMap.origin_confidence},</if>
             <if test="dataMap.origin_malscore != null">#{dataMap.origin_malscore},</if>
             <if test="dataMap.attacker_icampaign != null">#{dataMap.attacker_icampaign},</if>
-            <if test="dataMap.attacker_host_asset_id != null">#{dataMap.attacker_host_asset_id}::int8,</if>
-            <if test="dataMap.attacker_organization_id != null">#{dataMap.attacker_organization_id}::int8,</if>
-            <if test="dataMap.victim_host_asset_id != null">#{dataMap.victim_host_asset_id}::int8,</if>
-            <if test="dataMap.victim_organization_id != null">#{dataMap.victim_organization_id}::int8,</if>
+            <if test="dataMap.attacker_host_asset_id != null">#{dataMap.attacker_host_asset_id},</if>
+            <if test="dataMap.attacker_organization_id != null">#{dataMap.attacker_organization_id},</if>
+            <if test="dataMap.victim_host_asset_id != null">#{dataMap.victim_host_asset_id},</if>
+            <if test="dataMap.victim_organization_id != null">#{dataMap.victim_organization_id},</if>
             <if test="dataMap.logout_time != null">#{dataMap.logout_time},</if>
             <if test="dataMap.http_req_line != null">#{dataMap.http_req_line},</if>
             <if test="dataMap.desip_security_scope_id != null">#{dataMap.desip_security_scope_id},</if>
             <if test="dataMap.srcip_security_scope_id != null">#{dataMap.srcip_security_scope_id},</if>
-            <if test="dataMap.http_resp_length != null">#{dataMap.http_resp_length}::int8,</if>
+            <if test="dataMap.http_resp_length != null">#{dataMap.http_resp_length},</if>
             <if test="dataMap.tc_attack_type != null">#{dataMap.tc_attack_type},</if>
-            <if test="dataMap.tc_realip != null">#{dataMap.tc_realip}::inet,</if>
+            <if test="dataMap.tc_realip != null">#{dataMap.tc_realip},</if>
             <if test="dataMap.attacker_ip_lists != null">#{dataMap.attacker_ip_lists},</if>
             <if test="dataMap.login_password != null">#{dataMap.login_password},</if>
             <if test="dataMap.detail != null">#{dataMap.detail},</if>
@@ -660,12 +662,12 @@
             <if test="dataMap.login_abnormal_type != null">#{dataMap.login_abnormal_type},</if>
             <if test="dataMap.file_tag != null">#{dataMap.file_tag},</if>
             <if test="dataMap.file_platform != null">#{dataMap.file_platform},</if>
-            <if test="dataMap.target_ip != null">#{dataMap.target_ip}::inet,</if>
+            <if test="dataMap.target_ip != null">#{dataMap.target_ip},</if>
             <if test="dataMap.collect_date != null">#{dataMap.collect_date},</if>
-            <if test="dataMap.tc_client_ip != null">#{dataMap.tc_client_ip}::inet,</if>
-            <if test="dataMap.tc_server_ip != null">#{dataMap.tc_server_ip}::inet,</if>
-            <if test="dataMap.tc_externalip != null">#{dataMap.tc_externalip}::inet,</if>
-            <if test="dataMap.http_status_code != null">#{dataMap.http_status_code}::int8,</if>
+            <if test="dataMap.tc_client_ip != null">#{dataMap.tc_client_ip},</if>
+            <if test="dataMap.tc_server_ip != null">#{dataMap.tc_server_ip},</if>
+            <if test="dataMap.tc_externalip != null">#{dataMap.tc_externalip},</if>
+            <if test="dataMap.http_status_code != null">#{dataMap.http_status_code},</if>
             <if test="dataMap.device_domian != null">#{dataMap.device_domian},</if>
             <if test="dataMap.src_ip_str != null">#{dataMap.src_ip_str},</if>
             <if test="dataMap.src_port_str != null">#{dataMap.src_port_str},</if>
@@ -711,28 +713,28 @@
             <if test="dataMap.origin_agent_name != null">#{dataMap.origin_agent_name},</if>
             <if test="dataMap.origin_work_group != null">#{dataMap.origin_work_group},</if>
             <if test="dataMap.origin_asset_group != null">#{dataMap.origin_asset_group},</if>
-            <if test="dataMap.origin_local_port != null">#{dataMap.origin_local_port}::int8,</if>
-            <if test="dataMap.origin_agent_ip != null">#{dataMap.origin_agent_ip}::inet,</if>
-            <if test="dataMap.origin_internal_ip != null">#{dataMap.origin_internal_ip}::inet,</if>
-            <if test="dataMap.origin_external_ip != null">#{dataMap.origin_external_ip}::inet,</if>
-            <if test="dataMap.origin_local_addr != null">#{dataMap.origin_local_addr}::inet,</if>
-            <if test="dataMap.agent_id != null">#{dataMap.agent_id}::int8,</if>
+            <if test="dataMap.origin_local_port != null">#{dataMap.origin_local_port},</if>
+            <if test="dataMap.origin_agent_ip != null">#{dataMap.origin_agent_ip},</if>
+            <if test="dataMap.origin_internal_ip != null">#{dataMap.origin_internal_ip},</if>
+            <if test="dataMap.origin_external_ip != null">#{dataMap.origin_external_ip},</if>
+            <if test="dataMap.origin_local_addr != null">#{dataMap.origin_local_addr},</if>
+            <if test="dataMap.agent_id != null">#{dataMap.agent_id},</if>
             <if test="dataMap.agent_name != null">#{dataMap.agent_name},</if>
             <if test="dataMap.tc_title != null">#{dataMap.tc_title},</if>
             <if test="dataMap.log_id != null">#{dataMap.log_id},</if>
             <if test="dataMap.event_date != null">#{dataMap.event_date},</if>
             <if test="dataMap.event_time_ts != null">#{dataMap.event_time_ts},</if>
-            <if test="dataMap.event_level != null">#{dataMap.event_level}::int ,</if>
-            <if test="dataMap.src_ip != null">#{dataMap.src_ip}::inet,</if>
-            <if test="dataMap.src_port != null">#{dataMap.src_port}::BIGINT ,</if>
-            <if test="dataMap.dest_ip != null">#{dataMap.dest_ip}::inet,</if>
+            <if test="dataMap.event_level != null">#{dataMap.event_level},</if>
+            <if test="dataMap.src_ip != null">#{dataMap.src_ip},</if>
+            <if test="dataMap.src_port != null">#{dataMap.src_port},</if>
+            <if test="dataMap.dest_ip != null">#{dataMap.dest_ip},</if>
             <if test="dataMap.dest_port != null">#{dataMap.dest_port}::BIGINT,</if>
             <if test="dataMap.event_time != null">#{dataMap.event_time},</if>
             <if test="dataMap.attacker_country != null">#{dataMap.attacker_country},</if>
             <if test="dataMap.src_mac != null">#{dataMap.src_mac},</if>
             <if test="dataMap.dest_mac != null">#{dataMap.dest_mac},</if>
             <if test="dataMap.proto != null">#{dataMap.proto},</if>
-            <if test="dataMap.dev_id != null">#{dataMap.dev_id}::int8,</if>
+            <if test="dataMap.dev_id != null">#{dataMap.dev_id},</if>
             <if test="dataMap.created_time != null">#{dataMap.created_time},</if>
             <if test="dataMap.src_country != null">#{dataMap.src_country},</if>
             <if test="dataMap.src_country_code != null">#{dataMap.src_country_code},</if>
@@ -756,20 +758,20 @@
             <if test="dataMap.end_time != null">#{dataMap.end_time},</if>
             <if test="dataMap.file_created_time != null">#{dataMap.file_created_time},</if>
             <if test="dataMap.file_modified_time != null">#{dataMap.file_modified_time},</if>
-            <if test="dataMap.tc_miguan_scan_port != null">#{dataMap.tc_miguan_scan_port}::inet,</if>
+            <if test="dataMap.tc_miguan_scan_port != null">#{dataMap.tc_miguan_scan_port},</if>
             <if test="dataMap.process_path != null">#{dataMap.process_path},</if>
             <if test="dataMap.parent_process_path != null">#{dataMap.parent_process_path},</if>
             <if test="dataMap.gname != null">#{dataMap.gname},</if>
             <if test="dataMap.exe_name != null">#{dataMap.exe_name},</if>
             <if test="dataMap.exe_path != null">#{dataMap.exe_path},</if>
             <if test="dataMap.login_time != null">#{dataMap.login_time},</if>
-            <if test="dataMap.login_times != null">#{dataMap.login_times}::int8,</if>
+            <if test="dataMap.login_times != null">#{dataMap.login_times},</if>
             <if test="dataMap.check_item != null">#{dataMap.check_item},</if>
             <if test="dataMap.check_type != null">#{dataMap.check_type},</if>
-            <if test="dataMap.attacker_ip != null">#{dataMap.attacker_ip}::inet,</if>
-            <if test="dataMap.attacker_port != null">#{dataMap.attacker_port}::int8,</if>
-            <if test="dataMap.victim_ip != null">#{dataMap.victim_ip}::inet,</if>
-            <if test="dataMap.victim_port != null">#{dataMap.victim_port}::int8,</if>
+            <if test="dataMap.attacker_ip != null">#{dataMap.attacker_ip},</if>
+            <if test="dataMap.attacker_port != null">#{dataMap.attacker_port},</if>
+            <if test="dataMap.victim_ip != null">#{dataMap.victim_ip},</if>
+            <if test="dataMap.victim_port != null">#{dataMap.victim_port},</if>
             <if test="dataMap.attacker_city != null">#{dataMap.attacker_city},</if>
             <if test="dataMap.attacker_lon != null">#{dataMap.attacker_lon},</if>
             <if test="dataMap.attacker_lat != null">#{dataMap.attacker_lat},</if>
@@ -795,7 +797,7 @@
             <if test="dataMap.file_ssdeep != null">#{dataMap.file_ssdeep},</if>
             <if test="dataMap.victim_country_code != null">#{dataMap.victim_country_code},</if>
             <if test="dataMap.http_xff_ip != null">#{dataMap.http_xff_ip},</if>
-            <if test="dataMap.tc_miguan_class != null">#{dataMap.tc_miguan_class}::inet,</if>
+            <if test="dataMap.tc_miguan_class != null">#{dataMap.tc_miguan_class},</if>
             <if test="dataMap.pid != null">#{dataMap.pid},</if>
             <if test="dataMap.ppid != null">#{dataMap.ppid},</if>
             <if test="dataMap.process_name != null">#{dataMap.process_name},</if>
@@ -822,35 +824,35 @@
             <if test="dataMap.dest_city != null">#{dataMap.dest_city},</if>
             <if test="dataMap.dest_lon != null">#{dataMap.dest_lon},</if>
             <if test="dataMap.dest_lat != null">#{dataMap.dest_lat},</if>
-            <if test="dataMap.event_category != null">#{dataMap.event_category}::int4,</if>
-            <if test="dataMap.attack_result != null">#{dataMap.attack_result}::int4,</if>
-            <if test="dataMap.probe_ip != null">#{dataMap.probe_ip}::inet,</if>
-            <if test="dataMap.device_ip != null">#{dataMap.device_ip}::inet,</if>
+            <if test="dataMap.event_category != null">#{dataMap.event_category},</if>
+            <if test="dataMap.attack_result != null">#{dataMap.attack_result},</if>
+            <if test="dataMap.probe_ip != null">#{dataMap.probe_ip},</if>
+            <if test="dataMap.device_ip != null">#{dataMap.device_ip},</if>
             <if test="dataMap.device_manufacturer != null">#{dataMap.device_manufacturer},</if>
             <if test="dataMap.device_name != null">#{dataMap.device_name},</if>
             <if test="dataMap.product_name != null">#{dataMap.product_name},</if>
             <if test="dataMap.__id != null">#{dataMap.__id},</if>
-            <if test="dataMap.__count != null">#{dataMap.__count}::int8,</if>
+            <if test="dataMap.__count != null">#{dataMap.__count},</if>
             <if test="dataMap.__count_reason != null">#{dataMap.__count_reason},</if>
-            <if test="dataMap.event_type != null">#{dataMap.event_type}::int,</if>
+            <if test="dataMap.event_type != null">#{dataMap.event_type},</if>
             <if test="dataMap.protocol != null">#{dataMap.protocol},</if>
             <if test="dataMap.shell_cmd != null">#{dataMap.shell_cmd},</if>
             <if test="dataMap.parent_name != null">#{dataMap.parent_name},</if>
             <if test="dataMap.host_file_path != null">#{dataMap.host_file_path},</if>
             <if test="dataMap.uid != null">#{dataMap.uid},</if>
-            <if test="dataMap.fall != null">#{dataMap.fall}::int4,</if>
-            <if test="dataMap.tc_miguan_server_ip != null">#{dataMap.tc_miguan_server_ip}::inet,</if>
-            <if test="dataMap.dev_type != null">#{dataMap.dev_type}::int4,</if>
-            <if test="dataMap.collect_method != null">#{dataMap.collect_method}::int4,</if>
-            <if test="dataMap.field_cate_id != null">#{dataMap.field_cate_id}::int4,</if>
-            <if test="dataMap.device_type != null">#{dataMap.device_type}::int4,</if>
-            <if test="dataMap.tc_miguan_client_ip != null">#{dataMap.tc_miguan_client_ip}::inet,</if>
-            <if test="dataMap.tc_miguan_name != null">#{dataMap.tc_miguan_name}::inet,</if>
-            <if test="dataMap.origin_total_packages != null">#{dataMap.origin_total_packages}::int8,</if>
-            <if test="dataMap.origin_total_bytes != null">#{dataMap.origin_total_bytes}::int8,</if>
-            <if test="dataMap.origin_peak_packages_rate != null">#{dataMap.origin_peak_packages_rate}::int8,</if>
-            <if test="dataMap.origin_peak_bytes_rate != null">#{dataMap.origin_peak_bytes_rate}::int8,</if>
-            <if test="dataMap.origin_peak_flows_rate != null">#{dataMap.origin_peak_flows_rate}::int8,</if>
+            <if test="dataMap.fall != null">#{dataMap.fall},</if>
+            <if test="dataMap.tc_miguan_server_ip != null">#{dataMap.tc_miguan_server_ip},</if>
+            <if test="dataMap.dev_type != null">#{dataMap.dev_type},</if>
+            <if test="dataMap.collect_method != null">#{dataMap.collect_method},</if>
+            <if test="dataMap.field_cate_id != null">#{dataMap.field_cate_id},</if>
+            <if test="dataMap.device_type != null">#{dataMap.device_type},</if>
+            <if test="dataMap.tc_miguan_client_ip != null">#{dataMap.tc_miguan_client_ip},</if>
+            <if test="dataMap.tc_miguan_name != null">#{dataMap.tc_miguan_name},</if>
+            <if test="dataMap.origin_total_packages != null">#{dataMap.origin_total_packages},</if>
+            <if test="dataMap.origin_total_bytes != null">#{dataMap.origin_total_bytes},</if>
+            <if test="dataMap.origin_peak_packages_rate != null">#{dataMap.origin_peak_packages_rate},</if>
+            <if test="dataMap.origin_peak_bytes_rate != null">#{dataMap.origin_peak_bytes_rate},</if>
+            <if test="dataMap.origin_peak_flows_rate != null">#{dataMap.origin_peak_flows_rate},</if>
             <if test="dataMap.apt_orgname != null">#{dataMap.apt_orgname},</if>
             <if test="dataMap.apt_orgmsg != null">#{dataMap.apt_orgmsg},</if>
             <if test="dataMap.mail_message_id != null">#{dataMap.mail_message_id},</if>
@@ -860,18 +862,18 @@
             <if test="dataMap.mail_url != null">#{dataMap.mail_url},</if>
             <if test="dataMap.mail_cc != null">#{dataMap.mail_cc},</if>
             <if test="dataMap.algorithm != null">#{dataMap.algorithm},</if>
-            <if test="dataMap.miningpool_ip != null">#{dataMap.miningpool_ip}::inet,</if>
+            <if test="dataMap.miningpool_ip != null">#{dataMap.miningpool_ip},</if>
             <if test="dataMap.process_md5 != null">#{dataMap.process_md5},</if>
             <if test="dataMap.pprocess_md5 != null">#{dataMap.pprocess_md5},</if>
             <if test="dataMap.source_servername != null">#{dataMap.source_servername},</if>
             <if test="dataMap.origin_source_servername != null">#{dataMap.origin_source_servername},</if>
             <if test="dataMap.mail_filename != null">#{dataMap.mail_filename},</if>
             <if test="dataMap.dst_upload_appname != null">#{dataMap.dst_upload_appname},</if>
-            <if test="dataMap.target_port != null">#{dataMap.target_port}::int8,</if>
+            <if test="dataMap.target_port != null">#{dataMap.target_port},</if>
             <if test="dataMap.gid != null">#{dataMap.gid},</if>
             <if test="dataMap.origin_uid != null">#{dataMap.origin_uid},</if>
             <if test="dataMap.origin_gid != null">#{dataMap.origin_gid},</if>
-            <if test="dataMap.target_ports != null">#{dataMap.target_ports}::int8,</if>
+            <if test="dataMap.target_ports != null">#{dataMap.target_ports},</if>
             <if test="dataMap.tc_miguan_name1 != null">#{dataMap.tc_miguan_name1},</if>
             <if test="dataMap.tc_miguan_class1 != null">#{dataMap.tc_miguan_class1},</if>
             <if test="dataMap.etl_time != null">#{dataMap.etl_time},</if>
@@ -879,7 +881,7 @@
             <if test="dataMap.desip_security_scope != null">#{dataMap.desip_security_scope},</if>
             <if test="dataMap.srcip_security_scope != null">#{dataMap.srcip_security_scope},</if>
             <if test="dataMap.collect_time_ts != null">#{dataMap.collect_time_ts},</if>
-            <if test="dataMap.tc_miguan_scan_port1 != null">#{dataMap.tc_miguan_scan_port1}::inet,</if>
+            <if test="dataMap.tc_miguan_scan_port1 != null">#{dataMap.tc_miguan_scan_port1},</if>
             <if test="dataMap.src_dev_name != null">#{dataMap.src_dev_name},</if>
             <if test="dataMap.collect_protocol != null">#{dataMap.collect_protocol},</if>
             <if test="dataMap.destination_system_type != null">#{dataMap.destination_system_type},</if>