From 0ba453c66cd5d20b970c894358031c9c06df7071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 05 六月 2025 10:43:26 +0800
Subject: [PATCH] 大屏修改，以及报错日志添加
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index aa9bcf4..946e9e9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -417,6 +417,18 @@
${params.dataScope}
</where>
</select>
+ <select id="getAllVideo" resultType="java.lang.Long">
+ SELECT
+ IFNULL(SUM(IF((m.camera_fun_type like '%1%'), 1, 0)), 0) AS video
+ FROM t_monitor m
+ left join t_yw_point p on m.serial_number = p.serial_number
+ </select>
+
+ <select id="getIdListVideo" resultType="java.lang.String">
+ select m.serial_number
+ FROM t_monitor m where m.camera_fun_type like '%1%'
+ </select>
+
<select id="assetManagementCount" resultType="java.util.Map">
SELECT count(*) AS total,
IFNULL(SUM(IF((m.camera_fun_type like '%1%'), 1, 0)), 0) AS video,
@@ -500,7 +512,7 @@
<!-- LEFT JOIN t_yw_unit u ON p.unit_id = u.id-->
<!-- LEFT JOIN t_work_order w ON w.serial_number = p.serial_number-->
<!-- WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL-->
-<!-- <if test="dateRange != null and dateRange.size > 0">-->
+<!-- <if test="dateRange != null and dateRange.size > 0">-->
<!-- AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')-->
<!-- </if>-->
<!-- GROUP BY months-->
@@ -513,17 +525,18 @@
u.unit_name AS name,
CONCAT(MONTH(w.create_time), '鏈�') AS months
from
- (select count(m.id) as num from t_monitor m where m.serial_number IN (SELECT p.serial_number from t_yw_unit u,t_yw_point p where p.unit_id = u.id and u.id = 21 AND p.examine_status = 1)
+ (select count(m.id) as num from t_monitor m where m.serial_number IN (SELECT p.serial_number from t_yw_unit u,t_yw_point p where p.unit_id = u.id and u.id = #{unitId} AND p.examine_status = 1)
) as a
join
t_work_order w
JOIN t_yw_unit u ON u.id = w.unit_id
where w.unit_id=#{unitId}
<if test="dateRange != null and dateRange.size > 0">
- AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0], '%Y-%m') AND DATE_FORMAT(#{dateRange[1], '%Y-%m')
+ AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')
</if>
- AND w.deleted = 1
+ AND w.deleted = 1
GROUP BY months
+ ORDER BY months
</select>
<select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
SELECT
@@ -693,9 +706,9 @@
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 p.online != 0 and p.examine_status = 1
+ where p.examine_status = 1
</select>
-
+<!--涓婃柟淇敼浜� p.online != 0 and-->
<update id="updateOnlineFromUyOrHk">
<foreach collection="onlineList" item="online" separator=";">
UPDATE
--
Gitblit v1.8.0