From afe75b34fd0c1770944f3d6e960b3e2461d272d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Sat, 7 Dec 2024 15:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=AE=A1=E6=A0=B8=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/DcWarningController.java | 18 +++++++++++++++++-
.../com/zc/business/enums/UniversalEnum.java | 2 +-
.../mapper/business/DcWarningMapper.xml | 9 +++++----
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
index e5cc6ff5..b651abf6 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
@@ -109,7 +109,23 @@ public class DcWarningController extends BaseController
startPage();
return getDataTable(dcWarningService.videoReviewEventSourceList(dcWarning)) ;
}
- @ApiOperation("查询视频审核事件时间")
+
+ @PostMapping("/videoReviewEventSourceListExport")
+ public void videoReviewEventSourceListExport(HttpServletResponse response, DcWarning dcWarning) throws UnsupportedEncodingException {
+ List<DcWarning> list = dcWarningService.videoReviewEventSourceList(dcWarning);
+ ExcelUtil<DcWarning> util = new ExcelUtil<>(DcWarning.class);
+ util.exportExcel(response, list, "视频审核事件");
+
+ } @PostMapping("/videoReviewListExport")
+ public void videoReviewListExport(HttpServletResponse response, DcWarning dcWarning) throws UnsupportedEncodingException {
+ List<DcWarning> list = dcWarningService.videoReviewEventTimeList(dcWarning);
+ ExcelUtil<DcWarning> util = new ExcelUtil<>(DcWarning.class);
+ util.exportExcel(response, list, "视频审核事件");
+
+ }
+
+
+ @ApiOperation("查询视频审核事件时间")
// @PreAuthorize("@ss.hasPermi('business:warning:list')")
@GetMapping("/videoReviewEventTime")
public AjaxResult videoReviewEventTime(DcWarning dcWarning)
diff --git a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
index a6524184..ac1d7ea6 100644
--- a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
+++ b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
@@ -2469,7 +2469,7 @@ RADAR_ASSOCIATED_MONITORING_POINT_QUERY_INTERFACE(0,"/api/radar/v1/selectRelateB
// 停车
PULL_UP(4, "停车"),
- // illegalParking
+ // 非法停车
ILLEGAL_PARKING(4, "illegalParking"),
// 逆行
diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
index 9cf63136..c3c52036 100644
--- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="relieveType" column="relieve_type" />
<result property="auditFlag" column="audit_flag" />
<result property="auditTime" column="audit_time" />
+ <result property="auditor" column="auditor" />
</resultMap>
<resultMap type="map" id="eventMap">
<result property="targetId" column="targetId" />
@@ -469,7 +470,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY warning_time DESC
</select>
<select id="selectVideoReviewEventTypeList" resultMap="DcWarningResult" parameterType="com.zc.business.domain.DcWarning">
- select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source
+ select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time,warning_state,warning_time,lane,direction,warning_title,auditor
from dc_warning
<where>
<if test="startStakeMark != null and startStakeMark != ''"> and stake_mark BETWEEN #{startStakeMark} and #{endStakeMark}</if>
@@ -496,7 +497,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectVideoEventList" resultMap="DcWarningResult" parameterType="com.zc.business.domain.DcWarning">
- select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time
+ select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time,warning_state,warning_time,lane,direction,warning_title,auditor
from dc_warning
<where>
(audit_flag = '1' OR audit_flag = '2')
@@ -521,7 +522,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectVideoReviewEventTimeList" resultMap="DcWarningResult" parameterType="com.zc.business.domain.DcWarning">
- select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time
+ select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time,warning_state,warning_time,lane,direction,warning_title,auditor
from dc_warning
<where>
<if test="startStakeMark != null and startStakeMark != ''"> and stake_mark BETWEEN #{startStakeMark} and #{endStakeMark}</if>
@@ -549,7 +550,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="videoReviewEventTimeList" resultMap="DcWarningResult" parameterType="com.zc.business.domain.DcWarning">
- select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time
+ select id, stake_mark, warning_type, warning_subclass, audit_flag,warning_source,audit_time,warning_state,warning_time,lane,direction,warning_title,auditor
from dc_warning
<where>
(audit_flag = '1' OR audit_flag = '2')