From 90276a76b56cc1e744f7fa68ce921a28a8a9c92f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 11:52:10 +0800
Subject: [PATCH] 运行监控报表导出时间少一天问题
---
ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
index 7cf6eed..13c0c67 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<sql id="selectImageResourceSecurityDetailVo">
- select id,
+ SELECT id,
ip,
dept_id,
alarm_category,
@@ -24,23 +24,36 @@
num,
alarm_time,
create_time
- from t_image_resource_security_detail
+ FROM t_image_resource_security_detail
</sql>
- <select id="selectImageResourceSecurityDetailList" resultMap="ImageResourceSecurityDetailResult">
- <include refid="selectImageResourceSecurityDetailVo"/>
+ <select id="selectImageResourceSecurityDetailList"
+ resultType="com.ycl.platform.domain.entity.ImageResourceSecurityDetail">
+ select id,
+ ip,
+ a.dept_id,
+ dept_name,
+ alarm_category,
+ alarm_level,
+ num,
+ alarm_time,
+ a.create_time
+ from t_image_resource_security_detail a
+ LEFT JOIN sys_dept b ON a.dept_id = b.dept_id AND b.del_flag = 0
<where>
- <if test="ip != null and ip != ''">and ip = #{ip}</if>
- <if test="deptId != null ">and dept_id = #{deptId}</if>
- <if test="alarmCategory != null and alarmCategory != ''">and alarm_category = #{alarmCategory}</if>
- <if test="alarmLevel != null ">and alarm_level = #{alarmLevel}</if>
- <if test="num != null ">and num = #{num}</if>
- <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>
+ <if test="startTime!=null and endTime!=null">
+ and a.alarm_time between #{startTime} and #{endTime}
+ </if>
+ <if test="keyword!=null and keyword!=''">
+ and (b.dept_name like concat('%',#{keyword},'%') or
+ a.ip like concat('%',#{keyword},'%')
+ )
+ </if>
</where>
</select>
<select id="selectImageResourceSecurityDetailById">
- resultMap="ImageResourceSecurityDetailResult">
+ resultMap="ImageResourceSecurityDetailResult">
<include refid="selectImageResourceSecurityDetailVo"/>
where id = #{id}
</select>
@@ -67,6 +80,15 @@
</trim>
</insert>
+ <insert id="saveBatch">
+ INSERT INTO t_image_resource_security_detail (ip, dept_id, alarm_category, alarm_level, num, alarm_time,
+ create_time) VALUES
+ <foreach collection="list" item="item" index="index" separator=",">
+ (#{item.ip}, #{item.deptId}, #{item.alarmCategory}, #{item.alarmLevel}, #{item.num}, #{item.alarmTime},
+ NOW())
+ </foreach>
+ </insert>
+
<update id="updateImageResourceSecurityDetail">
update t_image_resource_security_detail
<trim prefix="SET" suffixOverrides=",">
@@ -82,9 +104,9 @@
</update>
<delete id="deleteImageResourceSecurityDetailById">
- delete
- from t_image_resource_security_detail
- where id = #{id}
+ DELETE
+ FROM t_image_resource_security_detail
+ WHERE id = #{id}
</delete>
<delete id="deleteImageResourceSecurityDetailByIds">
--
Gitblit v1.8.0