From 9e11e94f8a92a62695657bb2b3b59a1cf47058a5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 17 十月 2025 13:38:11 +0800
Subject: [PATCH] 大屏显示问题以及报备导出
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 115 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 17 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index cd84be6..bdf1ed6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -166,7 +166,31 @@
<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="constructionType != null and constructionType != ''">
+ <choose>
+ <when test="constructionType == 'PHASE_ONE_TWO'">
+ and m.name LIKE 'DX_%'
+ </when>
+ <when test="constructionType == 'PHASE_THREE'">
+ and m.name LIKE 'LT_%'
+ </when>
+
+ <when test="constructionType == 'PHASE_FOURTH'">
+ and (
+ m.name LIKE 'DX_R%'
+ OR
+ m.name LIKE 'DX_RS%'
+ )
+ </when>
+ <when test="constructionType == 'EASTERN_NEW_CITY'">
+ and m.name LIKE 'DX_RD%'
+ </when>
+ <when test="constructionType == 'YAN_TAN_PHASE_TWO_FACE'">
+ and m.name LIKE 'DX_R2%'
+ </when>
+ </choose>
+ </if>
+
${params.dataScope}
</where>
</select>
@@ -396,7 +420,7 @@
IFNULL(SUM(IF((p.online = 1 and p.ping_online = 1), 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF((p.online = -1 or p.ping_online = -1), 1, 0)), 0) AS postsPercentage,
IFNULL(SUM(IF((p.online = 0 and p.ping_online = 0), 1, 0)), 0) AS unknownNumbers,
- IFNULL(ROUND(SUM(IF((p.online = 1 and p.online= 1), 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+ IFNULL(ROUND(SUM(IF((p.online = 1 and p.ping_online= 1), 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
@@ -414,9 +438,47 @@
<if test="deptTag!=null">
and p.dept_tag = #{deptTag}
</if>
+ <if test="address != null">
+ and p.dept_id = #{address}
+ </if>
+ <if test="constructionType != null and constructionType != ''">
+ <choose>
+ <when test="constructionType == 'PHASE_ONE_TWO'">
+ and m.name LIKE 'DX_%'
+ </when>
+ <when test="constructionType == 'PHASE_THREE'">
+ and m.name LIKE 'LT_%'
+ </when>
+ <when test="constructionType == 'PHASE_FOURTH'">
+ and (
+ m.name LIKE 'DX_R%'
+ OR
+ m.name LIKE 'DX_RS%'
+ )
+ </when>
+ <when test="constructionType == 'EASTERN_NEW_CITY'">
+ and m.name LIKE 'DX_RD%'
+ </when>
+ <when test="constructionType == 'YAN_TAN_PHASE_TWO_FACE'">
+ and m.name LIKE 'DX_R2%'
+ </when>
+ </choose>
+ </if>
${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,
@@ -487,26 +549,45 @@
WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
]]>
</select>
-
+<!-- 鏌ヨ t_yw_unit 涓璱d 涓猴紵 骞朵笖 t_work_order-->
+<!-- <select id="home" resultType="java.util.Map">-->
+<!-- SELECT-->
+<!-- u.unit_name AS name,-->
+<!-- CONCAT(MONTH(w.create_time), '鏈�') AS months,-->
+<!-- COUNT(w.id) AS num1,-->
+<!-- COUNT(w.id) - COUNT(m.id) AS num2-->
+<!-- FROM-->
+<!-- t_monitor m-->
+<!-- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number-->
+<!-- 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">-->
+<!-- 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-->
+<!-- ORDER BY months-->
+<!-- </select>-->
<select id="home" resultType="java.util.Map">
- SELECT
+ select count(distinct w.serial_number) as num1,
+ CASE WHEN( a.num -count(distinct w.serial_number))
+ <![CDATA[ < 0 THEN 0 ELSE (a.num -count(distinct w.serial_number)) END as num2 ]]>,
u.unit_name AS name,
- CONCAT(MONTH(w.create_time), '鏈�') AS months,
- COUNT(w.id) AS num1,
- COUNT(m.id) - COUNT(w.id) AS num2
- FROM
- t_monitor m
- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
- 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
+ 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 = #{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')
</if>
+ AND w.deleted = 1
GROUP BY months
ORDER BY months
- </select>
-
+</select>
<select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
SELECT
'video' as type,
@@ -675,9 +756,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