From b2dc3088b63fae558c80d91f16b146cf26eb6809 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 一月 2023 15:34:00 +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 | 10 +++++++---
1 files changed, 7 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 912a7c2..db8e345 100644
--- a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
@@ -6,18 +6,21 @@
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
</select>
@@ -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