From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 01adb5c..b7522e0 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -140,13 +140,14 @@
                                         @RequestParam(required = false) String site,
                                         @RequestParam(required = false) String startTime,
                                         @RequestParam(required = false) String endTime,
-                                        @RequestParam(required = false) Integer violationsTypeId) {
+                                        @RequestParam(required = false) Integer violationsTypeId,
+                                        @RequestParam(required = false) Integer videoId) {
 
         Page<Object> queryList;
         if (type == 1) {
-            queryList = baseCaseService.listViolationsPage(current,size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
+            queryList = baseCaseService.listViolationsPage(current, size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
         } else if (type == 2) {
-            queryList = baseCaseService.listIllegalBuilding(current,size, state, resource);
+            queryList = baseCaseService.listIllegalBuilding(current, size, state, resource);
         } else {
             return CommonResult.failed("bad request url");
         }
@@ -383,8 +384,12 @@
 
     @GetMapping("/video_inspection")
     @ApiOperation("棰勮鐮斿垽")
-    public CommonResult searchVideoInspection(@RequestParam Integer current) {
-        return CommonResult.success(baseCaseService.selectVideoInspection(current));
+    public CommonResult searchVideoInspection(@RequestParam Integer current,
+                                              @RequestParam(required = false) Long gradeId,
+                                              @RequestParam(required = false) Long videoId,
+                                              @RequestParam(required = false) String beginTime,
+                                              @RequestParam(required = false) String endTime) {
+        return CommonResult.success(baseCaseService.selectVideoInspection(current, gradeId, videoId, beginTime, endTime));
     }
 
     @GetMapping("/video_inspection/Count")

--
Gitblit v1.8.0