From 008a174c9f333166e8a2c5d9363c91c619def610 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 20:44:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 425b65a..4483a04 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
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeRule;
@@ -28,17 +29,25 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.user.entity.User;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.apache.http.util.EncodingUtils;
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.springblade.core.tool.constant.BladeConstant;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.Collection;
import java.util.Map;
@@ -71,7 +80,7 @@
* 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
* @return baseQueryObject
*/
- @GetMapping("/gridCodeRule")
+ @GetMapping(value = "/gridCodeRule")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
@@ -88,7 +97,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);
}
/**
@@ -100,7 +109,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);
}
/**
@@ -111,7 +120,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);
}
@@ -207,4 +216,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