From 8d0e312443876371e2be7ae9a2cb70e4f73bb2cd Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 09:35:33 +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 | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 007f825..a891839 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
@@ -25,7 +25,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@@ -136,22 +135,21 @@
* @Description delete illegal buildings or violations
* @Param [ids, type]
**/
- @ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
+ @ApiOperation(value = "鎵瑰鐞�-鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/batch_deletion")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
- public CommonResult removeCases(@RequestParam String[] ids, @RequestParam Integer type) {
+ public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
- List<String> idList = Arrays.asList(ids);
- if (!idList.isEmpty()) {
+ if (!ids.isEmpty()) {
+ CommonResult.success(baseCaseService.removeBatchByIds(ids));
if (type == violationType) {
- return CommonResult.success(violationsService.removeBatchByIds(idList));
+ return CommonResult.success(violationsService.removeBatchByIds(ids));
} else if (type == illegalBuildingType) {
- return CommonResult.success(illegalBuildingService.removeBatchByIds(idList));
+ return CommonResult.success(illegalBuildingService.removeBatchByIds(ids));
}
- return CommonResult.success(baseCaseService.removeBatchByIds(idList));
}
return CommonResult.failed("request parameter is null");
}
@@ -224,7 +222,7 @@
@ApiOperation(value = "妗堜欢鐘舵�佷慨鏀�")
@PutMapping("/case_status_update")
@ApiImplicitParams({
- @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)",name = "state")
+ @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)", name = "state")
})
public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) {
return CommonResult.success(baseCaseService
@@ -254,8 +252,8 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- public CommonResult endCase(@RequestParam Integer caseId,@RequestParam String result){
- baseCaseService.endCase(caseId,result);
+ public CommonResult endCase(@RequestParam Integer caseId, @RequestParam String result) {
+ baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0