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 | 125 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 37 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 6172da9..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
@@ -2,26 +2,31 @@
import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
-import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
-import com.ycl.vo.casePool.CasePoolViolationVO;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
@@ -34,7 +39,7 @@
* @since 2022-09-24
*/
@RestController
-@RequestMapping("/base-case")
+@RequestMapping("/base_case")
@Api(tags = "妗堜欢姹�")
public class BaseCaseController extends BaseController {
@@ -48,6 +53,9 @@
@Autowired
IDisposeRecordService iDisposeRecordService;
+
+ @Autowired
+ UtilNumber utilNumber;
@Autowired
@@ -72,23 +80,24 @@
* @Param [size, current, state, type, resource]
**/
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
- @GetMapping("/query/{type}")
+ @GetMapping("/query")
@ApiImplicitParams({
- @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�)", dataType = "Integer"),
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", 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")
})
public CommonResult searchViolation(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam Integer state,
- @PathVariable(value = "type") Integer type,
- @RequestParam Integer resource) {
+ @RequestParam(required = false) Integer type,
+ @RequestParam(required = false) Integer resource) {
if (state != null) {
Page<Object> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
Page<Object> queryList;
- Integer violation = 01;
- Integer illegalBuilding = 02;
+ Integer violation = 1;
+ Integer illegalBuilding = 2;
if (type == violation) {
queryList = baseCaseService.listViolationsPage(page, state, resource);
} else if (type == illegalBuilding) {
@@ -109,15 +118,11 @@
@ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/deletion")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
- })
- @ApiResponses({
- @ApiResponse(code = 200, message = "鎴愬姛", response = CasePoolViolationVO.class),
- @ApiResponse(code = 200, message = "鎴愬姛", response = CasePoolIllegalBuildingVO.class),
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
- Integer violationType = 01;
- Integer illegalBuildingType = 02;
+ Integer violationType = 1;
+ Integer illegalBuildingType = 2;
if (id != null) {
if (type == violationType) {
return CommonResult.success(violationsService.removeById(id));
@@ -134,22 +139,21 @@
* @Description delete illegal buildings or violations
* @Param [ids, type]
**/
- @ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
+ @ApiOperation(value = "鎵瑰鐞�-鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/batch_deletion")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
- public CommonResult removeCases(@RequestParam String[] ids, @RequestParam Integer type) {
- Integer violationType = 01;
- Integer illegalBuildingType = 02;
- List<String> idList = Arrays.asList(ids);
- if (!idList.isEmpty()) {
+ public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
+ Integer violationType = 1;
+ Integer illegalBuildingType = 2;
+ 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");
}
@@ -162,8 +166,14 @@
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
+ Integer violation = 1;
+ Integer resource = 2;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(violationParam, baseCase);
+ baseCase.setEventSource(resource);
+ baseCase.setCategory(violation);
+ baseCase.setCode(utilNumber.createCaseCode());
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -176,8 +186,14 @@
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
+ Integer illegalBuilding = 2;
+ Integer resource = 2;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(illegalBuildingParam, baseCase);
+ baseCase.setCategory(illegalBuilding);
+ baseCase.setEventSource(resource);
+ baseCase.setCode(utilNumber.createCaseCode());
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
@@ -187,11 +203,11 @@
@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));
}
- @ApiOperation("浜哄伐璺緞妗堜欢鍥剧墖灞曠ず")
+ @ApiOperation(value = "浜哄伐璺緞妗堜欢鍥剧墖灞曠ず")
@GetMapping("/hand_work_case_images")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
@@ -200,13 +216,48 @@
return CommonResult.success(baseCaseService.listCaseImages(id, type));
}
- @ApiOperation("妗堜欢鏆備笉澶勭悊")
- @PutMapping("/case_leave")
- public CommonResult updateCaseStatus(@RequestParam Integer caseId) {
- Integer leaveType = 8;
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description case status update
+ * @Param [caseId, status]
+ **/
+ @ApiOperation(value = "妗堜欢鐘舵�佷慨鏀�")
+ @PutMapping("/case_status_update")
+ @ApiImplicitParams({
+ @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
.update(new LambdaUpdateWrapper<BaseCase>()
.eq(BaseCase::getId, caseId)
- .set(BaseCase::getState, leaveType)));
+ .set(BaseCase::getState, state)));
}
-}
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description reset case
+ * @Param [caseId]
+ **/
+ @ApiOperation(value = "鏆備笉澶勭疆閲嶆柊澶勭疆")
+ @PutMapping("/reset")
+ public CommonResult resetCase(@RequestParam Integer caseId) {
+ Integer firstNum = 1;
+ Integer state = iDisposeRecordService
+ .list(new LambdaQueryWrapper<DisposeRecord>()
+ .eq(DisposeRecord::getBaseCaseId, caseId).
+ orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+ return CommonResult.success(baseCaseService
+ .update(new LambdaUpdateWrapper<BaseCase>()
+ .eq(BaseCase::getId, caseId)
+ .set(BaseCase::getState, state)));
+ }
+
+ @ApiOperation(value = "缁撴")
+ @PutMapping("/end_case")
+ 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