From 0879050c6f47cf61488848d2bdb882ec33bf341d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:46:52 +0800
Subject: [PATCH] 代码优化
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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..2964cf0 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"),
@@ -112,6 +112,46 @@
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(required = false) Integer state,
+ @RequestParam 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,
+ @RequestParam(required = false) Integer violationsTypeId,
+ @RequestParam(required = false) Integer videoId) {
+
+ 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);
+ } else if (type == 2) {
+ queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
+ } else {
+ return CommonResult.failed("bad request url");
+ }
+ return CommonResult.success(queryList);
}
/**
@@ -271,6 +311,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
@@ -283,7 +341,7 @@
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
- orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+ orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
return CommonResult.success(baseCaseService
.update(new LambdaUpdateWrapper<BaseCase>()
.eq(BaseCase::getId, caseId)
--
Gitblit v1.8.0