From fe8751d252f9ae5710de65586904c46be2134835 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 00:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 6775baf..7d526d8 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -89,7 +89,7 @@
</foreach>
</select>
- <select id="selectByNumbers" resultType="com.ycl.platform.domain.vo.TMonitor">
+ <select id="selectByNumbers" resultType="com.ycl.platform.domain.entity.TMonitor">
select * from t_monitor where serial_number in
<foreach collection="numbers" separator="," open="(" close=")" item="number">
#{number}
@@ -300,12 +300,9 @@
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
IFNULL(ROUND(SUM(IF(on_state = 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
<where>
camera_fun_type like concat('%', #{cameraFunType}, '%')
</where>
- ${params.dataScope}
</select>
<select id="recoveryException" resultType="java.util.Map">
@@ -508,9 +505,13 @@
#{query.keyword} as keyword
FROM
t_monitor tm
+ INNER JOIN t_yw_point yp ON yp.serial_number = tm.serial_number
<where>
<if test="query.keyword != null and query.keyword != ''">
AND tm.name like concat('%', #{query.keyword}, '%')
+ </if>
+ <if test="query.startTIme != null and query.endTime != null">
+ AND yp.create_time between #{query.startTime} and #{query.endTime}
</if>
</where>
</select>
@@ -572,4 +573,13 @@
<delete id="deleteAll">
delete from t_monitor
</delete>
+
+ <select id="getGBbyGB" resultType="string">
+ SELECT
+ DISTINCT serial_number
+ FROM
+ t_monitor
+ WHERE
+ deleted = 0 AND serial_number in <foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach>
+ </select>
</mapper>
--
Gitblit v1.8.0