From 130d97bd8e29c8fb6de18133cc3606f5fd00628e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 九月 2022 11:47:04 +0800
Subject: [PATCH] 部门批量删除和细节修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 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 13eb69e..c607977 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,6 +2,7 @@
import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
@@ -9,6 +10,7 @@
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
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 io.swagger.annotations.Api;
@@ -22,6 +24,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.UUID;
/**
@@ -46,6 +49,10 @@
IIllegalBuildingService illegalBuildingService;
@Autowired
+ IDisposeRecordService iDisposeRecordService;
+
+
+ @Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
this.baseCaseService = baseCaseService;
}
@@ -67,23 +74,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 = "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) {
@@ -104,11 +112,11 @@
@ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/deletion")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ @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));
@@ -128,11 +136,11 @@
@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;
+ Integer violationType = 1;
+ Integer illegalBuildingType = 2;
List<String> idList = Arrays.asList(ids);
if (!idList.isEmpty()) {
if (type == violationType) {
@@ -153,8 +161,15 @@
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
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);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -165,11 +180,46 @@
* @Param [violationParam]
**/
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
- @PostMapping("/addition_violation")
+ @PostMapping("/addition_illegal_building")
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);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
+
+ @ApiOperation(value = "妗堜欢璇︽儏")
+ @GetMapping("/baseCaseDetail/{code}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "code", value = "浜嬩欢缂栧彿")
+ })
+ public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) {
+ return CommonResult.success(baseCaseService.baseCaseDetail(code));
+ }
+
+ @ApiOperation("浜哄伐璺緞妗堜欢鍥剧墖灞曠ず")
+ @GetMapping("/hand_work_case_images")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ })
+ public CommonResult queryCaseImages(@RequestParam Integer id, @RequestParam Integer type) {
+ return CommonResult.success(baseCaseService.listCaseImages(id, type));
+ }
+
+ @ApiOperation("妗堜欢鏆備笉澶勭悊")
+ @PutMapping("/case_leave")
+ public CommonResult updateCaseStatus(@RequestParam Integer caseId) {
+ Integer leaveType = 8;
+ return CommonResult.success(baseCaseService
+ .update(new LambdaUpdateWrapper<BaseCase>()
+ .eq(BaseCase::getId, caseId)
+ .set(BaseCase::getState, leaveType)));
+ }
}
--
Gitblit v1.8.0