From 10cdd20b93bb3803f6bd09e8acf78743a0e3c4e7 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 18 Oct 2023 16:20:04 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=20id=20=E6=9F=A5=E8=AF=A2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/axzo/tyr/client/feign/ProductApi.java | 10 ++++++++++
 .../tyr/client/model/product/ProductSearchPageReq.java |  3 ---
 .../server/controller/product/ProductController.java   |  8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java
index 77cfd610..603db227 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java
@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 产品相关 API
@@ -102,4 +104,12 @@ public interface ProductApi {
      */
     @PostMapping("api/auth/product/feature/relation/update")
     ApiResult<Boolean> updateFeatureRelation(@Validated @RequestBody List<ProductFeatureRelationUpdateReq> req);
+
+    /**
+     * 查询指定工作台关联的服务包下的产品权限点
+     *
+     * @param workspaceIds
+     * @return
+     */
+    ApiResult<Map<Long, List<ProductFeatureRelationVO>>> queryProductFeatureRelationByWorkspace(Set<Long> workspaceIds);
 }
diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchPageReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchPageReq.java
index 2451a09b..6f16df0d 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchPageReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchPageReq.java
@@ -2,11 +2,8 @@ package cn.axzo.tyr.client.model.product;
 
 
 import cn.axzo.core.domain.PageRequest;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/product/ProductController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/product/ProductController.java
index c3ae5fb8..0dda138e 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/product/ProductController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/product/ProductController.java
@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 产品相关 API 实现
@@ -124,4 +126,10 @@ public class ProductController implements ProductApi {
         }
         return productFeatureRelationService.updateFeatureRelation(req);
     }
+
+
+    @Override
+    public ApiResult<Map<Long, List<ProductFeatureRelationVO>>> queryProductFeatureRelationByWorkspace(Set<Long> workspaceIds) {
+        return ApiResult.ok(productFeatureRelationService.getByWorkspace(workspaceIds));
+    }
 }