From 3e5bba6ac8fd2a26445bf93208a5ee1745405548 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 12:20:07 +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 |   58 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 22 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 881e106..e49b382 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;
@@ -24,18 +25,29 @@
 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.com.vci.starter.web.util.VciBaseUtil;
+
+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;
 
@@ -65,24 +77,14 @@
 	}
 
 	/**
-	 * 缂栫爜瑙勫垯 鍒嗛〉
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
-	public R<IPage<CodeRuleVO>> list(CodeRule codeRule, Query query) {
-		IPage<CodeRule> pages = codeRuleService.page(Condition.getPage(query), Condition.getQueryWrapper(codeRule));
-		return R.data(CodeRuleWrapper.build().pageVO(pages));
-	}
-
-	/**
 	 * 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
+	 * @return baseQueryObject
 	 */
-	@GetMapping("/gridCodeRule")
+	@GetMapping(value = "/gridCodeRule")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
-	public R<IPage<CodeRuleVO>> gridCodeRule(CodeRuleVO CodeRule, Query query) {
-		IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(Condition.getPage(query.setDescs("CREATETIME")), CodeRule);
+	public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
+		IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(bladeQueryObject.getQuery().setDescs("CREATETIME"), bladeQueryObject.getConditionMap());
 		return R.data(pages);
 	}
 
@@ -95,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);
 	}
 
 	/**
@@ -107,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);
 	}
 
 	/**
@@ -118,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);
 	}
 
@@ -150,15 +152,14 @@
 
 	/**
 	 * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
-	 * @param CodeRule
-	 * @param query
+	 * @param bladeQueryObject
 	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 */
 	@GetMapping("/refDataGrid")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�", notes = "浼犲叆oids")
-	public R<IPage<CodeRuleVO>> refDataGridCodeRule(CodeRuleVO CodeRule, Query query){
-		return R.data(codeRuleService.refDataGridCodeRule(Condition.getPage(query),CodeRule));
+	public R<IPage<CodeRuleVO>> refDataGridCodeRule(BladeQueryObject bladeQueryObject){
+		return R.data(codeRuleService.refDataGridCodeRule(bladeQueryObject));
 	}
 
 	/**
@@ -215,4 +216,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