From bd8147d7890bf60d88e4007c1af726ba5f364cf5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 14 三月 2023 11:24:31 +0800
Subject: [PATCH] 拼接地址
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 14 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 27ad473..569df4d 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
@@ -6,9 +6,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
-import com.ycl.controller.video.common.constant.BaseCaseStatus;
-import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.controller.BaseController;
+import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.util.UtilNumber;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.VideoInspectParam;
@@ -86,7 +86,7 @@
* @Description query illegal building and violation
* @Param [size, current, state, type, resource]
**/
- @ApiOperation(value = "鏌ヨ杩濊杩濆缓")
+/* @ApiOperation(value = "鏌ヨ杩濊杩濆缓")
@GetMapping("/query")
@ApiImplicitParams({
@ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0-寰呭鐞�1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊5绔嬫6璋冨害7澶勭疆8鏍告煡9缁撴)", dataType = "Integer"),
@@ -99,16 +99,56 @@
@RequestParam(required = false) Integer type,
@RequestParam(required = false) Integer resource) {
if (state != null) {
- Page<Object> page = new Page<>();
- page.setCurrent(current);
- page.setSize(size);
Page<Object> queryList;
Integer violation = 1;
Integer illegalBuilding = 2;
if (type == violation) {
- queryList = baseCaseService.listViolationsPage(page, state, resource);
+ queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource);
} else if (type == illegalBuilding) {
- queryList = baseCaseService.listIllegalBuilding(page, state, resource);
+ queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
+ } else {
+ return CommonResult.failed("bad request url");
+ }
+ return CommonResult.success(queryList);
+ }
+ return CommonResult.failed("request parameter is null");
+ }*/
+
+ @ApiOperation(value = "鏌ヨ杩濊杩濆缓")
+ @GetMapping("/query")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0-寰呭鐞�1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊5绔嬫6璋冨害7澶勭疆8鏍告煡9缁撴)", dataType = "Integer"),
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer"),
+ @ApiImplicitParam(name = "resource", value = "1 瑙嗛,2 鎵嬪姩", dataType = "Integer"),
+ @ApiImplicitParam(name = "code", dataType = "String"),
+ @ApiImplicitParam(name = "categoryBig", dataType = "String"),
+ @ApiImplicitParam(name = "categorySmall", dataType = "String"),
+ @ApiImplicitParam(name = "street", dataType = "Integer"),
+ @ApiImplicitParam(name = "site", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", dataType = "String")
+
+ })
+ public CommonResult searchViolation(@RequestParam Integer size,
+ @RequestParam Integer current,
+ @RequestParam Integer state,
+ @RequestParam(required = false) Integer type,
+ @RequestParam(required = false) Integer resource,
+ @RequestParam(required = false) String code,
+ @RequestParam(required = false) String categoryBig,
+ @RequestParam(required = false) String categorySmall,
+ @RequestParam(required = false) Integer street,
+ @RequestParam(required = false) String site,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime ){
+ if (state != null) {
+ Page<Object> queryList;
+ Integer violation = 1;
+ Integer illegalBuilding = 2;
+ if (type == violation) {
+ queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime);
+ } else if (type == illegalBuilding) {
+ queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
} else {
return CommonResult.failed("bad request url");
}
@@ -248,6 +288,50 @@
.set(BaseCase::getState, state)));
}
+ @ApiOperation(value = "妗堜欢鎵瑰湪瀛︿範")
+ @PutMapping("/batch_case_study")
+ public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) {
+ ids.stream().forEach(item ->
+ {
+ BaseCase baseCase = new BaseCase();
+ baseCase.setId(item);
+ baseCase.setState(3);
+ baseCaseService.updateById(baseCase);
+ });
+ return CommonResult.success("success");
+ }
+
+ @ApiOperation(value = "妗堜欢鎵规殏涓嶅鐞�")
+ @PutMapping("/batch_case_Ignore")
+ public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) {
+ ids.stream().forEach(item ->
+ {
+ BaseCase baseCase = new BaseCase();
+ baseCase.setId(item);
+ baseCase.setState(4);
+ baseCaseService.updateById(baseCase);
+ });
+ return CommonResult.success("success");
+ }
+
+ @ApiOperation(value = "璋冨害绠＄悊-鎵归噺鍒犻櫎")
+ @DeleteMapping("/batch_case_delete")
+ public CommonResult batchCaseDelete(@RequestParam List<Long> ids){
+ ids.forEach(
+ item->{
+ BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
+ if (baseCase.getCategory()==1){
+ violationsService.removeById(item);
+ baseCaseService.removeById(item);
+ }else {
+ illegalBuildingService.removeById(item);
+ baseCaseService.removeById(item);
+ }
+ }
+ );
+ return CommonResult.success("success");
+ }
+
/**
* @return com.ycl.api.CommonResult
* @Description reset case
@@ -303,19 +387,19 @@
@GetMapping("/video_inspection")
@ApiOperation("棰勮鐮斿垽")
- public CommonResult searchVideoInspection(@RequestParam Integer current){
- return CommonResult.success(baseCaseService.selectVideoInspection(current));
+ public CommonResult searchVideoInspection(@RequestParam Integer current) {
+ return CommonResult.success(baseCaseService.selectVideoInspection(current));
}
@GetMapping("/video_inspection/Count")
@ApiOperation("棰勮鐮斿垽宸︿笂瑙掑緟瀹℃牳妗堜欢,浠婃棩瀹℃牳,浠婃棩鍦ㄥ涔�")
- public CommonResult searchCount(){
- return CommonResult.success(baseCaseService.selectCount());
+ public CommonResult searchCount() {
+ return CommonResult.success(baseCaseService.selectCount());
}
@PutMapping("/video_inspection")
@ApiOperation("棰勮鐮斿垽纭畾")
- public CommonResult searchCount(VideoInspectParam violationParam){
- return CommonResult.success(baseCaseService.updateCase(violationParam));
+ public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) {
+ return CommonResult.success(baseCaseService.updateCase(violationParam));
}
}
\ No newline at end of file
--
Gitblit v1.8.0