From dd0d2937c518cd6841b0034b9a67c02131ffdc2c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 10 三月 2023 00:02:12 +0800
Subject: [PATCH] 本地新oss，配置，经测试成功，原来bucket被推送太多数据，不方便测试
---
ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
index 912a7c2..13631f7 100644
--- a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
@@ -6,19 +6,22 @@
SELECT
t2.id,
t2.NAME,
- count( 0 ) AS count
+ count( 0 ) AS count,
+ t2.longitude,
+ t2.latitude
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>
- <if test="tap.startTime!=null and tap.startTime!=''and tap.endTime!=null and tap.endTime!=''" >
+ <if test="tap.startTime!=null and tap.startTime!=''and tap.endTime!=null and tap.endTime!=''">
t3.alarm_time between #{tap.startTime} and #{tap.endTime}
+ </if>
+ and t1.video_point_id IS NOT NULL
</where>
GROUP BY
t1.video_point_id
- ORDER BY
- count DESC
+ ORDER BY count DESC
</select>
<select id="selectTrendPointInfo" resultType="com.ycl.vo.TrendVo">
@@ -31,6 +34,7 @@
<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
</where>
GROUP BY
t1.video_point_id,DATE_FORMAT(t3.alarm_time,"%Y-%m-%d")
--
Gitblit v1.8.0