From e1341c21eff54bb24c1c98df2e65387ff7e17dd7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 九月 2022 21:10:42 +0800
Subject: [PATCH] 修改swagger错误和细节
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 167 insertions(+), 3 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 aa6978b..231c50c 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,15 +2,28 @@
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;
+import com.ycl.dto.casePool.IllegalBuildingParam;
+import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.service.caseHandler.IBaseCaseService;
-import com.ycl.vo.ViolationSettingVO;
+import com.ycl.service.caseHandler.IDisposeRecordService;
+import com.ycl.service.caseHandler.IIllegalBuildingService;
+import com.ycl.service.caseHandler.IViolationsService;
+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;
/**
@@ -23,9 +36,20 @@
*/
@RestController
@RequestMapping("/base-case")
+@Api(tags = "妗堜欢姹�")
public class BaseCaseController extends BaseController {
private IBaseCaseService baseCaseService;
+
+ @Autowired
+ IViolationsService violationsService;
+
+ @Autowired
+ IIllegalBuildingService illegalBuildingService;
+
+ @Autowired
+ IDisposeRecordService iDisposeRecordService;
+
@Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
@@ -34,12 +58,152 @@
@ApiOperation(value = "涓婁紶甯傚钩鍙�")
@PostMapping("/upload-event")
- public CommonResult uploadEvent(@RequestParam Integer caseId) {
+ public CommonResult uploadEvent(@RequestParam Integer caseId, CommonResult<Object> success) {
String msg = baseCaseService.uploadEvent(caseId);
if (StringUtils.isEmpty(msg)) {
- return CommonResult.success(null);
+ return success;
} else {
return CommonResult.failed(msg);
}
}
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description query illegal building and violation
+ * @Param [size, current, state, type, resource]
+ **/
+ @ApiOperation(value = "鏌ヨ杩濊杩濆缓")
+ @GetMapping("/query/{type}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�)", dataType = "Integer"),
+ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ })
+ public CommonResult searchViolation(@RequestParam Integer size,
+ @RequestParam Integer current,
+ @RequestParam Integer state,
+ @PathVariable(value = "type") Integer type,
+ @RequestParam 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;
+ if (type == violation) {
+ queryList = baseCaseService.listViolationsPage(page, state, resource);
+ } else if (type == illegalBuilding) {
+ queryList = baseCaseService.listIllegalBuilding(page, state, resource);
+ } else {
+ return CommonResult.failed("bad request url");
+ }
+ return CommonResult.success(queryList);
+ }
+ return CommonResult.failed("request parameter is null");
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description delete illegal building or violation
+ * @Param [id, type]
+ **/
+ @ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
+ @DeleteMapping("/deletion")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ })
+ public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
+ Integer violationType = 01;
+ Integer illegalBuildingType = 02;
+ if (id != null) {
+ if (type == violationType) {
+ return CommonResult.success(violationsService.removeById(id));
+ } else if (type == illegalBuildingType) {
+ return CommonResult.success(illegalBuildingService.removeById(id));
+ }
+ return CommonResult.success(baseCaseService.removeById(id));
+ }
+ return CommonResult.failed("request parameter is null");
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description delete illegal buildings or violations
+ * @Param [ids, type]
+ **/
+ @ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
+ @DeleteMapping("/batch_deletion")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", 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()) {
+ if (type == violationType) {
+ return CommonResult.success(violationsService.removeBatchByIds(idList));
+ } else if (type == illegalBuildingType) {
+ return CommonResult.success(illegalBuildingService.removeBatchByIds(idList));
+ }
+ return CommonResult.success(baseCaseService.removeBatchByIds(idList));
+ }
+ return CommonResult.failed("request parameter is null");
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description add violation
+ * @Param [violationParam]
+ **/
+ @ApiOperation(value = "娣诲姞杩濊妗堜欢")
+ @PostMapping("/addition_violation")
+ public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
+ BaseCase baseCase = new BaseCase();
+ BeanUtils.copyProperties(violationParam, baseCase);
+ baseCaseService.save(baseCase);
+ return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description add illegal building
+ * @Param [violationParam]
+ **/
+ @ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
+ @PostMapping("/addition_illegal_building")
+ public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
+ BaseCase baseCase = new BaseCase();
+ BeanUtils.copyProperties(illegalBuildingParam, baseCase);
+ 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("妗堜欢鏆備笉澶勭悊")
+ @GetMapping("/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