From 0b99371d3e543532608e691e2bdfda3e65e1912c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 10:18:24 +0800
Subject: [PATCH] 工单取图片查询优化
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 1d17737..fd81b85 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -99,7 +99,8 @@
<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, 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 from t_monitor m
+ 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 (
@@ -113,6 +114,7 @@
<if test="serialNumber != null and serialNumber != ''">and m.serial_number = #{serialNumber}</if>
<if test="name != null and name != ''">
and (name like concat('%', #{name}, '%')
+ or m.ip like concat('%', #{name}, '%')
or m.serial_number like concat('%', #{name}, '%')
or u.unit_name like concat('%', #{name}, '%'))
</if>
@@ -166,13 +168,19 @@
</select>
<select id="selectMonitorResult" resultType="com.ycl.platform.domain.result.SYS.TMonitorResult">
- select m.id, m.serial_number as no,d.dept_id,p.province_tag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online
+ select m.id, m.serial_number as no,m.name,m.camera_fun_type as monitorType,d.dept_id,p.province_tag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online
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
<where>
<if test="cameraFunType!=null">
- m.camera_fun_type like concat('%',#{cameraFunType},'%')
+ and m.camera_fun_type like concat('%',#{cameraFunType},'%')
+ </if>
+ <if test="deptIds!=null and deptIds.size>0">
+ and p.dept_id in
+ <foreach collection="deptIds" item="deptId" open="(" close=")" separator=",">
+ #{deptId}
+ </foreach>
</if>
</where>
</select>
@@ -409,7 +417,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 +427,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 +437,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 +446,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 +465,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 +482,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 +500,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