From 9d72eb559e67e3f0bb321198fc562f3cfd9a8625 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
index 8a74e7e..a67d6fa 100644
--- a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
@@ -21,8 +21,7 @@
</where>
GROUP BY
t1.video_point_id
- ORDER BY
- count DESC
+ ORDER BY count DESC
</select>
<select id="selectTrendPointInfo" resultType="com.ycl.vo.TrendVo">
@@ -35,10 +34,39 @@
<if test="longitude='' and longitude =null and latitude='' and latitude=null">
t2.longitude=#{longitude} and t2.latitude=#{latitude}
</if>
- and t1.video_point_id IS NOT NULL
+ and t1.video_point_id IS NOT NULL
</where>
GROUP BY
t1.video_point_id,DATE_FORMAT(t3.alarm_time,"%Y-%m-%d")
</select>
+ <select id="queryPointInfoByTime" resultType="com.ycl.vo.TrendVo">
+ SELECT t2.address, DATE_FORMAT(t3.alarm_time,"%Y-%m-%d") as dateTime,count(0) as count
+ FROM
+ ums_violations t1
+ LEFT JOIN ums_video_point t2 ON t2.id = t1.video_point_id
+ LEFT JOIN ums_video_alarm_report t3 ON t3.id = t1.video_alarm_report_id
+ where t1.video_point_id = #{pointId}
+ <if test="startTime!=null and startTime != ''">
+ and t3.alarm_time BETWEEN #{startTime} and #{endTime}
+ </if>
+
+ GROUP BY
+ t1.video_point_id,DATE_FORMAT(t3.alarm_time,"%Y-%m-%d")
+ order by DATE_FORMAT(t3.alarm_time,"%Y-%m-%d")
+ </select>
+ <select id="queryPointInfoTypeByTime" resultType="com.ycl.vo.TrendVo">
+ SELECT t3.algo_name as name,count(0) as count
+ FROM
+ ums_violations t1
+ LEFT JOIN ums_video_point t2 ON t2.id = t1.video_point_id
+ LEFT JOIN ums_video_alarm_report t3 ON t3.id = t1.video_alarm_report_id
+ where t3.algo_name is not null
+ and t1.video_point_id = #{pointId}
+ <if test="startTime!=null and startTime != ''">
+ and t3.alarm_time BETWEEN #{startTime} and #{endTime}
+ </if>
+ GROUP BY t3.algo_name
+ order by t3.algo_name
+ </select>
</mapper>
--
Gitblit v1.8.0