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/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