From 73548e5d89a79ef1850c03dea162dcf727e2c0b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:32:57 +0800
Subject: [PATCH] 去重
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 5bfc1f0..1474516 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -98,15 +98,25 @@
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
- camera_capture_area, on_state, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,
- IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name from t_monitor m
+ camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,
+ IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name,p.recovery_time,p.reason,p.start_time,p.end_time,w.work_order_no from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
- left join t_work_order w on m.serial_number = w.serial_number and w.deleted = 0
+ left join (
+ WITH cte AS (
+ SELECT *,row_number() OVER(PARTITION BY serial_number ORDER BY create_time DESC) rn FROM t_work_order
+ WHERE deleted = 0
+ ) SELECT * FROM cte WHERE rn=1
+ ) w on m.serial_number = w.serial_number and w.deleted = 0
left join t_yw_unit u on p.unit_id = u.id and u.deleted = 0
<where>
<if test="serialNumber != null and serialNumber != ''">and m.serial_number = #{serialNumber}</if>
- <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="name != null and name != ''">
+ and (name like concat('%', #{name}, '%')
+ or m.serial_number like concat('%', #{name}, '%')
+ or u.unit_name like concat('%', #{name}, '%'))
+ </if>
+ <if test="provinceTag != null ">and p.province_tag = #{provinceTag}</if>
<if test="siteType != null ">and site_type = #{siteType}</if>
<if test="macAddr != null and macAddr != ''">and mac_addr = #{macAddr}</if>
<if test="ip != null and ip != ''">and ip = #{ip}</if>
@@ -118,7 +128,8 @@
<if test="cameraCaptureArea != null and cameraCaptureArea != ''">and camera_capture_area =
#{cameraCaptureArea}
</if>
- <if test="onState != null ">and on_state = #{onState}</if>
+ <if test="time !=null and time !=''">and TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time}</if>
+ <if test="onState != null ">and p.online = #{onState}</if>
<if test="civilCode != null and civilCode != ''">and civil_code = #{civilCode}</if>
<if test="integratedDevice != null ">and integrated_device = #{integratedDevice}</if>
<if test="cameraBrand != null ">and camera_brand = #{cameraBrand}</if>
@@ -139,9 +150,9 @@
<if test="cameraDept != null and cameraDept != ''">and camera_dept = #{cameraDept}</if>
<if test="hybm != null and hybm != ''">and hybm = #{hybm}</if>
<if test="lxbm != null ">and lxbm = #{lxbm}</if>
- <if test="recovery != null ">and p.recovery = #{recovery}</if>
+<!-- <if test="recovery != null ">and p.recovery = #{recovery}</if>-->
+ ${params.dataScope}
</where>
- ${params.dataScope}
</select>
<select id="selectMonitorVOList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
@@ -307,26 +318,35 @@
<select id="getVideoCount" resultType="java.util.Map">
SELECT count(*) AS totalPosts,
- IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
- IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
- FROM t_monitor m
+ IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers,
+ IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS postsPercentage,
+ IFNULL(ROUND(SUM(IF(p.online, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage 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 and d.del_flag = 0
<where>
camera_fun_type like concat('%', #{cameraFunType}, '%')
+ <if test="provinceTag!=null">
+ and p.province_tag = #{provinceTag}
+ </if>
+ ${params.dataScope}
</where>
</select>
<select id="recoveryException" resultType="java.util.Map">
- <![CDATA[
SELECT count(*) AS totalPosts,
- IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
- IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+ IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers,
+ IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS postsPercentage,
+ IFNULL(ROUND(SUM(IF(p.online = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
FROM t_monitor t
- LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
- WHERE p.recovery = 1
- OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
- ]]>
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+ left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
+ <where>
+<!-- (p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time}) -->
+ <if test="provinceTag!=null">
+ and p.province_tag = #{provinceTag}
+ </if>
+ ${params.dataScope}
+ </where>
</select>
<select id="selectRecoveryMonitor" resultType="com.ycl.platform.domain.vo.TMonitorVO">
@@ -389,7 +409,7 @@
<select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
SELECT
- '瑙嗛' as type,
+ 'video' as type,
COUNT(p1.id) AS totalNum,
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
@@ -399,7 +419,7 @@
WHERE INSTR(camera_fun_type, 1)
UNION ALL
SELECT
- '杞﹁締' as type,
+ 'car' as type,
COUNT(p1.id) AS totalNum,
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
@@ -409,7 +429,7 @@
WHERE INSTR(camera_fun_type, 2)
UNION ALL
SELECT
- '浜鸿劯' as type,
+ 'face' as type,
COUNT(p1.id) AS totalNum,
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
@@ -418,7 +438,6 @@
LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 3)
</select>
-
<select id="monitorRate" resultType="com.ycl.platform.domain.vo.screen.MonitorRateVO">
SELECT
*
@@ -438,7 +457,7 @@
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 1)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
GROUP BY d.area, d.dept_id
- ORDER BY d.dept_id
+ ORDER BY d.area_code
) a
INNER JOIN
-- 杞﹁締璁惧
@@ -455,8 +474,8 @@
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 2)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 2)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
- GROUP BY d.area, d.dept_id
- ORDER BY d.dept_id
+ GROUP BY d.area, d.dept_id, d.area_code
+ ORDER BY d.area_code
) b ON a.area = b.area
INNER JOIN
-- 瑙嗛璁惧
@@ -473,8 +492,8 @@
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 3)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 3)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
- GROUP BY d.area, d.dept_id
- ORDER BY d.dept_id
+ GROUP BY d.area, d.area_code, d.dept_id
+ ORDER BY d.area_code
) c ON a.area = c.area
</select>
--
Gitblit v1.8.0