From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 9b7f3fc..2ffdc81 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -259,27 +259,37 @@
</select>
<select id="selectVideoInspection" resultType="com.ycl.vo.casePool.BaseCaseVO">
- SELECT t1.id as baseId,
- t1.`code`,
- t3.`name`,
- t3.url_address,
- t3.longitude,
- t3.latitude,
- t4.pic_data,
- t5.`name` as grade,
- t3.address,
- t3.plat_resource_id as platResourceId,
- t3.code as videoCode,
- t1.alarm_time as alarmTime,
- t1.alarm_time as currentAlarmTime,
- t4.algo_name as algoName
+ SELECT t1.id as baseId,
+ t1.`code`,
+ t3.`name`,
+ t3.url_address,
+ t3.longitude,
+ t3.latitude,
+ t4.pic_data,
+ t5.`name` as grade,
+ t3.address,
+ t3.plat_resource_id as platResourceId,
+ t3.code as videoCode,
+ t1.alarm_time as alarmTime,
+ t1.alarm_time as currentAlarmTime,
+ t4.algo_name as algoName
FROM ums_base_case t1
- LEFT JOIN ums_violations t2 ON t1.id = t2.id
- LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id
- LEFT JOIN ums_video_alarm_report t4 on t4.id = t2.video_alarm_report_id
- LEFT JOIN ums_data_dictionary t5 on t5.id = t2.grade_id
+ LEFT JOIN ums_violations t2 ON t1.id = t2.id
+ LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id
+ LEFT JOIN ums_video_alarm_report t4 on t4.id = t2.video_alarm_report_id
+ LEFT JOIN ums_data_dictionary t5 on t5.id = t2.grade_id
WHERE t1.state = 1
+ <if test="gradeId!=null">
+ and t2.grade_id = #{gradeId}
+ </if>
+ <if test="videoId!=null">
+ and t2.video_point_id = #{videoId}
+ </if>
+ <if test="beginTime!=null and beginTime!=''">
+ and t1.alarm_time between #{beginTime} and #{endTime}
+ </if>
group by t1.id
+ order by t1.id desc
</select>
<select id="selectRegisterCount" resultType="java.lang.Long">
@@ -322,9 +332,8 @@
t1.alarm_time,
t1.longitude,
t1.latitude,
- ( CASE WHEN t1.category = 1 THEN "杩濊" WHEN t1.category = 2 THEN "杩濆缓" ELSE "鍏朵粬" END ) AS type,
- ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "浜哄伐涓婃姤" ELSE "鍏朵粬" END ) AS alarmAdvice,
- ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "浜哄伐涓婃姤" ELSE "鍏朵粬" END ) AS source,
+ dd.name AS type,
+ ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "缃戞牸宸℃煡" ELSE "鍏朵粬" END ) AS source,
t1.site AS address,
t2.description,
t3.`name` AS point,
@@ -340,14 +349,15 @@
WHEN t1.state = 7 THEN '澶勭疆'
WHEN t1.state = 8 THEN '鏍告煡'
WHEN t1.state = 9 THEN '缁撴'
- END) `status` ,
- dd.`name` as grade
+ END) `alarmAdvice` ,
+ pdd.`name` as grade
FROM
ums_base_case t1
LEFT JOIN ums_violations t2 ON t1.id = t2.id
LEFT JOIN ums_video_point t3 ON t3.id = t2.video_point_id
LEFT JOIN ums_video_alarm_report t4 ON t4.id = t2.video_alarm_report_id
LEFT JOIN ums_data_dictionary dd on t2.grade_id = dd.id
+ LEFT JOIN ums_data_dictionary pdd on pdd.id = dd.parent_id
<where>
t1.category=1
<if test="beginTime !=''and beginTime!=null and endTime!=''and endTime!=null">
@@ -356,7 +366,7 @@
</if>
</where>
-
+ order by t1.id desc
</select>
<select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
SELECT t2.region_name name,
--
Gitblit v1.8.0