From 99a6eb4e06c930f00bbf05348e53f38b65969ecd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 12 七月 2023 18:41:52 +0800
Subject: [PATCH] 整合7-12代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 07b565f..ed6e760 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -36,6 +36,9 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -92,7 +95,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆CodeRule")
public R save(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
- return R.status(codeRuleService.addSave(codeRuleDTO));
+ return codeRuleService.addSave(codeRuleDTO);
}
/**
@@ -104,7 +107,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆CodeRule")
public R update(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
- return R.status(codeRuleService.editSave(codeRuleDTO));
+ return codeRuleService.editSave(codeRuleDTO);
}
/**
@@ -115,7 +118,7 @@
@DeleteMapping( "/deleteData")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "鍒犻櫎", notes = "浼犲叆codeRuleDTO")
- public R delCodeRule(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
+ public R delCodeRule(@RequestBody CodeRuleDTO codeRuleDTO) {
return codeRuleService.deleteCodeRule(codeRuleDTO);
}
@@ -211,4 +214,17 @@
return codeRuleService.clearAllCode(oid);
}
+ /**
+ * 妫�鏌ョ浉浼肩紪鐮佽鍒�
+ * @param oid
+ * @return 鎵ц缁撴灉
+ */
+ @GetMapping("/checkLikeCodeRule")
+ @ApiOperationSupport(order = 15)
+ @ApiOperation(value = "妫�鏌ョ浉浼肩紪鐮佽鍒�", notes = "浼犲叆oid")
+ public R checkLikeCodeRule(String oid){
+ return codeRuleService.checkLikeCodeRule(oid);
+ }
+
+
}
--
Gitblit v1.9.3