From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null，为前端添加数据默认为0
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 117 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 26 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 57197dc..244d095 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -90,12 +90,14 @@
</select>
<select id="selectByNumbers" resultType="com.ycl.platform.domain.entity.TMonitor">
- select * from t_monitor where serial_number in
+ select m.*,p.username,p.password
+ from t_monitor m left join t_yw_point p on m.serial_number = p.serial_number
+ where m.serial_number in
<foreach collection="numbers" separator="," open="(" close=")" item="number">
#{number}
</foreach>
</select>
-
+ <!-- TODO:寮傚父鎭㈠鐩戞帶鍜屾槸鍚︿骇鐢熷伐鍗曞瓧娈�-->
<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,
@@ -394,7 +396,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
@@ -415,7 +417,16 @@
${params.dataScope}
</where>
</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,
+ IFNULL(SUM(IF((m.camera_fun_type like '%2%'), 1, 0)), 0) AS face,
+ IFNULL(SUM(IF((m.camera_fun_type like '%3%'), 1, 0)), 0) AS car,
+ IFNULL(SUM(IF((p.examine_status = 1), 1, 0)), 0) as examine,
+ IFNULL(SUM(IF((p.examine_status = 0), 1, 0)), 0) as notExamine
+ FROM t_monitor m
+ left join t_yw_point p on m.serial_number = p.serial_number
+ </select>
<select id="recoveryException" resultType="java.util.Map">
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF((p.online = 1 and p.ping_online = 1), 1, 0)), 0) AS totalMembers,
@@ -476,26 +487,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,
@@ -607,16 +637,16 @@
tm.camera_fun_type,
tm.longitude,
tm.latitude,
- tm.camera_capture_area,
- tm.on_state,
+ d.dept_name as camera_capture_area,
+ yp.examine_status as on_state,
tm.civil_code,
tm.integrated_device,
tm.camera_brand,
tm.address,
tm.net_working,
tm.public_security,
- tm.installed_time,
- tm.management_unit,
+ yp.create_time as installed_time,
+ u.unit_name as management_unit,
tm.mu_contact_info,
tm.storage_days,
tm.monitor_azimuth,
@@ -626,15 +656,18 @@
tm.camera_type,
tm.camera_light_type,
tm.encoded_format,
- tm.camera_dept,
- tm.hybm,
- tm.lxbm
+ tm.camera_dept
FROM
t_monitor tm
INNER JOIN t_yw_point yp ON yp.serial_number = tm.serial_number
+ left join sys_dept d on yp.dept_id = d.dept_id and d.del_flag = 0
+ left join t_yw_unit u on yp.unit_id = u.id and u.deleted = 0
<where>
<if test="query.keyword != null and query.keyword != ''">
AND tm.name like concat('%', #{query.keyword}, '%')
+ </if>
+ <if test="query.examineStatus != null">
+ AND yp.examine_status = #{query.examineStatus}
</if>
<if test="query.startTIme != null and query.endTime != null">
AND yp.create_time between #{query.startTime} and #{query.endTime}
@@ -661,9 +694,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
@@ -675,6 +708,18 @@
EXISTS (SELECT 1 FROM t_monitor
WHERE ip = #{online.ip}
AND t_monitor.serial_number = t_yw_point.serial_number )
+ </foreach>
+ </update>
+
+ <update id="updateOnlineFromHk">
+ <foreach collection="onlineList" item="online" separator=";">
+ UPDATE
+ t_yw_point
+ SET
+ online = #{online.online},
+ update_time = #{online.updateTime}
+ WHERE
+ serial_number = #{online.serialNumber}
</foreach>
</update>
<update id="batchUpdateOnline">
@@ -696,4 +741,24 @@
on m.serial_number = p.serial_number
where (m.camera_fun_type = '2' or m.camera_fun_type = '3') and p.examine_status = 1
</select>
+
+ <select id="getByIp" resultType="com.ycl.platform.domain.result.SYS.TMonitorResult">
+ select m.ip,m.serial_number as no,p.id as pointId,p.province_tag_video,p.province_tag_car,p.province_tag_face,p.dept_tag,p.important_tag,p.important_command_image_tag
+ from t_monitor m
+ left join t_yw_point p on m.serial_number = p.serial_number
+ where p.examine_status = 1 and m.ip in
+ <foreach collection="ipList" item="ip" separator="," close=")" open="(">
+ #{ip}
+ </foreach>
+ </select>
+ <!-- 娓呯悊涓�鏈轰竴妗� -->
+ <delete id="clearMonitor">
+ delete m from t_monitor m left join t_yw_point p on m.serial_number = p.serial_number
+ where p.examine_status != 1
+ </delete>
+
+ <select id ="getVideoIds" resultType="java.lang.String">
+ select serial_number from t_monitor
+ where camera_fun_type like '%1%'
+ </select>
</mapper>
--
Gitblit v1.8.0