From 09d16543f899f54b8d96671a355a53a5740b1937 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:38:08 +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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 fb982d9..7fd828e 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
@@ -5,6 +5,7 @@
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.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
@@ -28,7 +29,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.UUID;
/**
@@ -121,6 +121,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鍒犻櫎妗堜欢")
public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -145,6 +146,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鎵归噺鍒犻櫎妗堜欢")
public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -166,6 +168,7 @@
**/
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濆缓妗堜欢")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
@@ -186,6 +189,7 @@
**/
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濊妗堜欢")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
@@ -255,8 +259,11 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢缁撴")
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