From 90599c1af35eb139710e1472d9c2acbab5a8eb07 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 04 四月 2023 11:07:24 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 2964cf0..ec42868 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
@@ -145,9 +145,9 @@
Page<Object> queryList;
if (type == 1) {
- queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId,videoId);
+ queryList = baseCaseService.listViolationsPage(current, size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
} else if (type == 2) {
- queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
+ queryList = baseCaseService.listIllegalBuilding(current, size, state, resource);
} else {
return CommonResult.failed("bad request url");
}
@@ -384,8 +384,19 @@
@GetMapping("/video_inspection")
@ApiOperation("棰勮鐮斿垽")
- public CommonResult searchVideoInspection(@RequestParam Integer current) {
- return CommonResult.success(baseCaseService.selectVideoInspection(current));
+ public CommonResult searchVideoInspection(@RequestParam Integer current,
+ @RequestParam Integer pageSize,
+ @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, pageSize, gradeId, videoId, beginTime, endTime));
+ }
+
+ @GetMapping("/video_inspection/{id}")
+ @ApiOperation("棰勮鐮斿垽璇︽儏")
+ public CommonResult getVideoInspection(@PathVariable Long id) {
+ return CommonResult.success(baseCaseService.getById(id));
}
@GetMapping("/video_inspection/Count")
--
Gitblit v1.8.0