From 2e644445577d0773482753b7d08b3425afae7837 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 13:58:20 +0800
Subject: [PATCH] 新问题 25-9-28
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index ae5d9d2..f6b5108 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -13,6 +13,8 @@
<result column="status" property="status"/>
<result column="dept_id" property="deptId"/>
<result column="dept_name" property="deptName"/>
+ <result column="username" property="username"/>
+ <result column="password" property="password"/>
<result column="remark" property="remark"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
@@ -58,8 +60,9 @@
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
+
<where>
- typ.examine_status = 1
+ typ.examine_status = 1 and typ.deleted = 0
<if test="query.pointName != null and query.pointName != ''">
AND typ.point_name like concat('%', #{query.pointName}, '%')
</if>
@@ -87,7 +90,7 @@
SELECT t_yw_point.id, point_name, start_time, end_time, status, unit_name AS remark
FROM t_yw_point
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
+ WHERE t_yw_point.deleted = 0 AND t_yw_point.examine_status = 1
AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value
FROM sys_config
WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
@@ -104,6 +107,8 @@
yu.unit_name,
yp.start_time,
yp.end_time,
+ yp.username,
+ yp.password,
d.area,
CASE WHEN yp.province_tag_video = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagVideoString,
CASE WHEN yp.province_tag_car = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagCarString,
@@ -146,7 +151,9 @@
province_tag_car = #{point.provinceTagCar},
province_tag_face = #{point.provinceTagFace},
important_command_image_tag = #{point.importantCommandImageTag},
- dept_tag = #{point.deptTag}
+ dept_tag = #{point.deptTag},
+ username = #{point.username},
+ password = #{point.password}
WHERE serial_number = #{point.serialNumber}
</foreach>
</update>
@@ -284,6 +291,12 @@
<if test="deptTag !=null">
dept_tag = #{deptTag},
</if>
+ <if test="username !=null and username!=''">
+ username = #{username},
+ </if>
+ <if test="password !=null and password !=''">
+ password = #{password},
+ </if>
unit_id = #{unitId},
start_time = #{startTime},
end_time = #{endTime},
@@ -291,4 +304,10 @@
</set>
where id =#{id}
</update>
+
+ <!-- 娓呯悊涓�鏈轰竴妗� -->
+ <delete id="clearMonitor">
+ delete from t_yw_point p
+ where p.examine_status != 1
+ </delete>
</mapper>
--
Gitblit v1.8.0