From 5e449c8bba2273313fd25457cae653a0f340c910 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 20 十一月 2023 18:26:32 +0800
Subject: [PATCH] 错误日志修复

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 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..c998c70 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,7 +17,6 @@
 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;
@@ -25,24 +24,19 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
 import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
-
-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 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.tool.api.R;
 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;
 
@@ -92,7 +86,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 +98,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 +109,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);
 	}
 
@@ -195,7 +189,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);
 	}
 
@@ -211,4 +205,16 @@
 		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