From c9d33bba9604987cb881fc97d014b6f4bfaab23a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 14:12:40 +0800
Subject: [PATCH] 申请集团码相关接口加上特殊取集团码的情况处理

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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..34039f6 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,26 @@
 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.rmi.ServerException;
 import java.util.Collection;
 import java.util.Map;
 
@@ -71,7 +81,7 @@
 	 * 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
 	 * @return baseQueryObject
 	 */
-	@GetMapping("/gridCodeRule")
+	@GetMapping(value = "/gridCodeRule")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
 	public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
@@ -88,7 +98,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 +110,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 +121,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);
 	}
 
@@ -191,7 +201,7 @@
 	@PostMapping("/clone")
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "鍏嬮殕缂栫爜瑙勫垯", notes = "浼犲叆codeRuleDTO")
-	public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO){
+	public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO) throws ServerException {
 		return codeRuleService.cloneCodeRule(codeRuleDTO);
 	}
 
@@ -207,4 +217,17 @@
 		return codeRuleService.clearAllCode(oid);
 	}
 
+	/**
+	 * 妫�鏌ョ浉浼肩紪鐮佽鍒�
+	 * @param oid
+	 * @return 鎵ц缁撴灉
+	 */
+	@GetMapping("/checkLikeCodeRule")
+	@ApiOperationSupport(order = 15)
+	@ApiOperation(value = "妫�鏌ョ浉浼肩紪鐮佽鍒�", notes = "浼犲叆oid")
+	public R checkLikeCodeRule(@Valid @RequestParam String oid){
+		return codeRuleService.checkLikeCodeRule(oid);
+	}
+
+
 }

--
Gitblit v1.9.3