From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 09 一月 2023 17:26:18 +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 | 26 ++++++++++++++++++++++---- 1 files changed, 22 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 e56ae3d..829e41f 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 @@ -7,8 +7,8 @@ import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; -import com.ycl.controller.video.common.constant.BaseCaseStatus; -import com.ycl.controller.video.common.util.UtilNumber; +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; @@ -247,7 +247,7 @@ @ApiOperation(value = "妗堜欢鎵瑰湪瀛︿範") @PutMapping("/batch_case_study") - public CommonResult batchHandCaseByStudy(@RequestBody List<Long> ids) { + public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) { ids.stream().forEach(item -> { BaseCase baseCase = new BaseCase(); @@ -260,7 +260,7 @@ @ApiOperation(value = "妗堜欢鎵规殏涓嶅鐞�") @PutMapping("/batch_case_Ignore") - public CommonResult batchHandCaseByIgnore(@RequestBody List<Long> ids) { + public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) { ids.stream().forEach(item -> { BaseCase baseCase = new BaseCase(); @@ -271,6 +271,24 @@ 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 -- Gitblit v1.8.0