1、适配部署环境变量自动注入
2、适配南网达梦数据库安全版SQL语句Group by 不支持自定义函数 3、达梦数据库驱动改为达梦提供的指定版本 4、修改syslog-consumer模块yaml 文件kafka 变量名称 5、修改访问日志告警表新增4个字段,完善异常行为详情页面显示字段
This commit is contained in:
+16
-1
@@ -22,12 +22,17 @@
|
||||
<result column="task_count" property="taskCount" />
|
||||
<result column="recent_discover_time" property="recentDiscoverTime" />
|
||||
<result column="epm_upper_limit" property="epmUpperLimit" />
|
||||
<result column="expire_time" property="expireTime" />
|
||||
<result column="remark" property="remark" />
|
||||
<result column="device_ip" property="deviceIp" />
|
||||
<result column="organization_id" property="organizationId" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id, created_at, updated_at, deleted_at, device_id, method, task_name,
|
||||
first_time, last_success_time, last_failed_time, detail_id, epm, epm_peak,
|
||||
process_architecture, task_count, recent_discover_time, epm_upper_limit
|
||||
process_architecture, task_count, recent_discover_time, epm_upper_limit,
|
||||
expire_time, remark, device_ip, organization_id
|
||||
</sql>
|
||||
|
||||
<!-- 多条件组合查询 -->
|
||||
@@ -60,6 +65,16 @@
|
||||
<if test="lastSuccessTime != null">
|
||||
AND last_success_time >= #{lastSuccessTime}
|
||||
</if>
|
||||
<!-- 新增字段查询 -->
|
||||
<if test="deviceIp != null and deviceIp != ''">
|
||||
AND device_ip = #{deviceIp}
|
||||
</if>
|
||||
<if test="organizationId != null">
|
||||
AND organization_id = #{organizationId}
|
||||
</if>
|
||||
<if test="remark != null and remark != ''">
|
||||
AND remark LIKE CONCAT('%', #{remark}, '%')
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY updated_at DESC
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user