From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
index b5ab37d..dacebd9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
@@ -44,10 +45,8 @@
public CommonResult searchViolations(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam(required = false) String keyWord) {
- Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listViolations(dataDictionaryPage, keyWord));
+
+ return CommonResult.success(iDataDictionaryService.listViolations(current, size, keyWord));
}
/**
@@ -57,6 +56,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolation(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -68,7 +68,9 @@
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolations(@RequestParam String[] ids) {
+
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
@@ -173,6 +175,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
@PostMapping("/addition/type")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濊浜嬮」")
public CommonResult addViolationType(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
--
Gitblit v1.8.0