From e458ae3ec8c4ae734f6e5e32e3d970860a51ac82 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 18:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 0242e06..7c7aef2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -149,7 +149,7 @@
camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
public_security, installed_time, management_unit, mu_contact_info, storage_days
, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
- camera_dept, hybm, lxbm,d.dept_id, d.dept_name from t_monitor m
+ camera_dept, hybm, lxbm,d.dept_id, d.dept_name,p.province_tag from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number
left join sys_dept d on p.dept_id = d.dept_id
</select>
@@ -573,4 +573,26 @@
<delete id="deleteAll">
delete from t_monitor
</delete>
+
+ <select id="getGBbyGB" resultType="string">
+ SELECT
+ DISTINCT serial_number
+ FROM
+ t_monitor
+ WHERE
+ serial_number in <foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach>
+ </select>
+
+ <select id="getDistinctIP" resultType="string">
+ SELECT
+ DISTINCT ip
+ FROM
+ t_monitor
+ </select>
+
+ <update id="updateOnline">
+ update t_yw_ponit set online = #{online.online}, update_time = #{online.updateTime} WHERE EXISTS (
+ SELECT 1 FROM t_monitor WHERE ip = #{online.ip} AND t_monitor.serial_number = t_yw_point.serial_number
+ );
+ </update>
</mapper>
--
Gitblit v1.8.0