From feffedd3a450e935debea24599cb5ce2f4c06ab2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 14 三月 2023 10:18:39 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 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 ca8d45e..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
@@ -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"),
@@ -104,6 +104,49 @@
Integer illegalBuilding = 2;
if (type == violation) {
queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource);
+ } else if (type == illegalBuilding) {
+ 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 {
@@ -271,6 +314,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