From d8852b852861a667a863f4e63431491ac2ff032b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 16:35:28 +0800
Subject: [PATCH] 录像可用接口remove调整为删除昨日数据
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 1bbc828..28f53bf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -16,8 +16,9 @@
<result column="remark" property="remark" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="category" property="category" />
- <result column="point_tag" property="pointTagString" />
+ <result column="province_tag" property="provinceTag" />
+ <result column="important_tag" property="importantTag" />
+ <result column="important_command_image_tag" property="importantCommandImageTag" />
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -28,7 +29,6 @@
SELECT
typ.id,
typ.point_name,
- typ.point_tag,
typ.start_time,
typ.end_time,
typ.unit_id,
@@ -39,8 +39,9 @@
typ.remark,
typ.create_time,
typ.update_time,
- typ.point_tag,
- typ.category
+ typ.important_tag,
+ typ.province_tag,
+ typ.important_command_image_tag
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
@@ -54,10 +55,10 @@
<select id="home" resultType="com.ycl.platform.domain.entity.YwPoint">
<![CDATA[
- SELECT id, point_name, start_time, end_time, status
+ SELECT t_yw_point.id, point_name, start_time, end_time, status, unit_name AS remark
FROM t_yw_point
- WHERE
- deleted = 0
+ LEFT JOIN t_yw_unit ON t_yw_unit.id = t_yw_point.unit_id AND t_yw_point.deleted = 0
+ WHERE t_yw_point.deleted = 0
AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value FROM sys_config WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
ORDER BY end_time
]]>
@@ -66,11 +67,11 @@
<select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
select * from t_yw_point
<where>
- <if test="important!=null and important!= '' ">
- and point_tag like concat('%', #{important}, '%')
+ <if test="important!=null and important == true ">
+ and important_tag = #{important}
</if>
- <if test="province!=null and province!= '' ">
- and point_tag like concat('%', #{province}, '%')
+ <if test="province!=null and province == true ">
+ and province_tag = #{province}
</if>
</where>
</select>
@@ -80,7 +81,12 @@
m.name as pointName,
m.serial_number,
m.ip,
- yu.unit_name
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
@@ -91,5 +97,4 @@
</if>
</where>
</select>
-
</mapper>
--
Gitblit v1.8.0