From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 6b74abf..794a558 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,10 +6,13 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
+import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.util.UtilNumber;
import com.ycl.controller.BaseController;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
+import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
@@ -24,9 +27,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
-import java.util.UUID;
/**
@@ -53,6 +54,9 @@
@Autowired
IDisposeRecordService iDisposeRecordService;
+ @Autowired
+ UtilNumber utilNumber;
+
@Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
@@ -78,7 +82,7 @@
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
@GetMapping("/query")
@ApiImplicitParams({
- @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�)", dataType = "Integer"),
+ @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")
})
@@ -135,22 +139,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");
}
@@ -165,13 +168,12 @@
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
- Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(violationParam, baseCase);
baseCase.setEventSource(resource);
baseCase.setCategory(violation);
- baseCase.setCode(UUID.randomUUID().toString());
- baseCase.setState(state);
+ baseCase.setCode(utilNumber.createCaseCode());
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -186,13 +188,12 @@
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
- Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(illegalBuildingParam, baseCase);
baseCase.setCategory(illegalBuilding);
baseCase.setEventSource(resource);
- baseCase.setCode(UUID.randomUUID().toString());
- baseCase.setState(state);
+ baseCase.setCode(utilNumber.createCaseCode());
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
@@ -202,7 +203,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "浜嬩欢缂栧彿")
})
- public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) {
+ public CommonResult<BaseCaseDetail> baseCaseDetail(@PathVariable(value = "code") String code) {
return CommonResult.success(baseCaseService.baseCaseDetail(code));
}
@@ -223,7 +224,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鏍告煡9缁撴)", name = "state")
})
public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) {
return CommonResult.success(baseCaseService
@@ -240,7 +241,7 @@
@ApiOperation(value = "鏆備笉澶勭疆閲嶆柊澶勭疆")
@PutMapping("/reset")
public CommonResult resetCase(@RequestParam Integer caseId) {
- Integer firstNum = 0;
+ Integer firstNum = 1;
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
@@ -253,8 +254,10 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- public CommonResult endCase(@RequestParam Integer caseId,@RequestParam String result){
- baseCaseService.endCase(caseId,result);
+ public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result) {
+ baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
}
-}
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0