From fd0287dfc1d5ab5c97f258d19757cafa29f7333c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 18 十月 2024 09:45:57 +0800
Subject: [PATCH] changeStatus回收方法调整

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
index 6203583..c34af1a 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
@@ -1,19 +1,20 @@
 package com.vci.ubcs.code.applyjtcodeservice.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreMetaAttr;
 import com.vci.ubcs.code.applyjtcodeservice.service.IGroupAttrPoolMappingService;
 import com.vci.ubcs.code.applyjtcodeservice.vo.GroupAttrPoolMappingVO;
+import com.vci.ubcs.omd.entity.Enum;
+import com.vci.ubcs.omd.vo.EnumVO;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.sql.rowset.serial.SerialException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 闆嗗洟灞炴�ф睜鏄犲皠Controller
@@ -30,12 +31,12 @@
 
 	/**
 	 * 鏌ヨ闆嗗洟灞炴�ф睜鏄犲皠鐨勫睘鎬�
-	 * @param groupAttrPoolMappingVO
+	 * @param bladeQueryObject
 	 * @return
 	 */
-	@PostMapping("/getGroupAttrPoolALlList")
-	public R<List<GroupAttrPoolMappingVO>> getGroupAttrPoolALlList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws SerialException {
-		return R.data(groupAttrPoolMappingService.getGroupAttrPoolALlList(groupAttrPoolMappingVO));
+	@GetMapping("/getGroupAttrPoolALlList")
+	public R<IPage<GroupAttrPoolMappingVO>> getGroupAttrPoolALlList(BladeQueryObject bladeQueryObject) throws ServiceException {
+		return R.data(groupAttrPoolMappingService.getGroupAttrPoolALlList(bladeQueryObject));
 	}
 
 	/**
@@ -44,7 +45,7 @@
 	 * @return
 	 */
 	@PostMapping("/getByGroupAttrKeyList")
-	public R<List<GroupAttrPoolMappingVO>> getByGroupAttrKeyList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws SerialException {
+	public R<List<GroupAttrPoolMappingVO>> getByGroupAttrKeyList(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException {
 		return R.data(groupAttrPoolMappingService.getByGroupAttrKeyList(groupAttrPoolMappingVO));
 	}
 
@@ -54,18 +55,18 @@
 	 * @return
 	 */
 	@PostMapping("/editGroupAttr")
-	public R editGroupAttr(@RequestBody List<GroupAttrPoolMappingVO>groupAttrPoolMappingVO) throws SerialException {
+	public R editGroupAttr(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVO) throws ServiceException {
 		return R.status(groupAttrPoolMappingService.editGroupAttr(groupAttrPoolMappingVO));
 	}
 
 	/**
-	 * 鏍规嵁闆嗗洟灞炴�х紪鍙锋煡璇㈤泦鍥㈠睘鎬ф睜鏄犲皠锛屾厧鐢ㄥ洜涓轰細鏇存柊鎵�鏈夌敤鍒拌繖涓泦鍥㈠睘鎬х殑璁板綍
+	 * 鏍规嵁闆嗗洟灞炴�х紪鍙锋煡璇㈤泦鍥㈠睘鎬ф睜鏄犲皠骞跺悓姝ワ紝鎱庣敤鍥犱负浼氭洿鏂版墍鏈夌敤鍒拌繖涓泦鍥㈠睘鎬х殑璁板綍
 	 * @param groupAttrPoolMappingVOS
 	 * @return
 	 */
 	@PostMapping("/syncGroupAttrMapping")
-	public R syncGroupAttrMapping(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws SerialException {
-		return R.status(groupAttrPoolMappingService.syncGroupAttrMapping(groupAttrPoolMappingVOS));
+	public R syncGroupAttrMapping(@RequestBody List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws ServiceException {
+		return groupAttrPoolMappingService.syncGroupAttrMapping(groupAttrPoolMappingVOS);
 	}
 
 	/**
@@ -75,8 +76,18 @@
 	 * @throws SerialException
 	 */
 	@PostMapping("/saveDistinctGroupAttr")
-	public R saveDistinctGroupAttr(@RequestBody List<DockingPreMetaAttr> dockingPreMetaAttrList) throws SerialException {
+	public R saveDistinctGroupAttr(@RequestBody List<DockingPreMetaAttr> dockingPreMetaAttrList) throws ServiceException {
 		return R.status(groupAttrPoolMappingService.saveDistinctGroupAttr(dockingPreMetaAttrList));
 	}
 
+	/**
+	 * 鏍规嵁鍒嗙被OID鑾峰彇鍒版ā鏉垮啀鏍规嵁灞炴�d鑾峰彇鍒版ā鏉夸笅鐨勫睘鎬d鐨別num鍊硷紝鐒跺悗鏌ヨ鍑烘灇涓�
+	 * @param groupAttrPoolMappingVO
+	 * @return
+	 */
+	@PostMapping("/getEnumAttrByClsOIdAndAttrId")
+	public R<List<EnumVO>> getEnumAttrByClsOIdAndAttrId(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException {
+		return groupAttrPoolMappingService.getEnumAttrByClsOIdAndAttrId(groupAttrPoolMappingVO);
+	}
+
 }

--
Gitblit v1.9.3