From 4c50d4acfdff4f454ea0f68f9a7ae61c5d599f3f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 13 十月 2022 10:07:53 +0800
Subject: [PATCH] 添加案件时候添加调度流程

---
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 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 a891839..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,6 +6,8 @@
 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;
@@ -26,7 +28,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.UUID;
 
 
 /**
@@ -38,7 +39,7 @@
  * @since 2022-09-24
  */
 @RestController
-@RequestMapping("/base-case")
+@RequestMapping("/base_case")
 @Api(tags = "妗堜欢姹�")
 public class BaseCaseController extends BaseController {
 
@@ -52,6 +53,9 @@
 
     @Autowired
     IDisposeRecordService iDisposeRecordService;
+
+    @Autowired
+    UtilNumber utilNumber;
 
 
     @Autowired
@@ -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")
     })
@@ -164,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()));
     }
@@ -185,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()));
     }
@@ -222,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
@@ -239,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).
@@ -252,8 +254,10 @@
 
     @ApiOperation(value = "缁撴")
     @PutMapping("/end_case")
-    public CommonResult endCase(@RequestParam Integer caseId, @RequestParam String 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