From e13b129c300d3eff2ba555d0c41bbccbaab1014a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 17 九月 2024 18:56:59 +0800
Subject: [PATCH] 新大屏数据对接
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 99950eb..1474516 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -409,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
@@ -419,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
@@ -429,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
@@ -438,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
*
@@ -458,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
-- 杞﹁締璁惧
@@ -475,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
-- 瑙嗛璁惧
@@ -493,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