From e380d0c9429e2f40d85bcaf8bc417a5c146e4979 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 11 Sep 2023 15:03:16 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java | 3 +++
 .../tyr/client/model/dict/request/BasicDictQueryReq.java     | 4 ++--
 .../tyr/server/controller/dict/SaasBasicDictController.java  | 5 +++++
 .../cn/axzo/tyr/server/service/SaasBasicDictService.java     | 2 ++
 .../tyr/server/service/impl/SaasBasicDictServiceImpl.java    | 5 +++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java
index 389d29cc..3cec8ab8 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java
@@ -83,4 +83,7 @@ public interface SaasBasicDictApi {
 
     @GetMapping("api/dict/get")
     ApiResult<BasicDictNodeResp> get(@RequestParam Long id);
+
+    @GetMapping("api/dict/get-by-ids")
+    ApiResult<List<BasicDictNodeResp>> getByIds(@RequestParam List<Long> ids) ;
 }
diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictQueryReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictQueryReq.java
index 7ee0fe68..ddb1708f 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictQueryReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictQueryReq.java
@@ -26,13 +26,13 @@ public class BasicDictQueryReq {
     /**
      * workspace
      */
-    @EnumValidator(enumClass = DictWorkSpaceTypeEnum.class, message = "枚举类型错误")
+//    @EnumValidator(enumClass = DictWorkSpaceTypeEnum.class, message = "枚举类型错误")
     private DictWorkSpaceTypeEnum workspaceType;
 
     /**
      * type
      */
-    @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
+//    @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
     private DictTypeFiledEnum type;
 
     /**
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java
index 977009ab..9fda27b6 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java
@@ -61,4 +61,9 @@ public class SaasBasicDictController implements SaasBasicDictApi {
     public ApiResult<BasicDictNodeResp> get(Long id) {
         return saasBasicDictService.getById(id);
     }
+
+    @Override
+    public ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids) {
+        return saasBasicDictService.getByIds(ids);
+    }
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
index 5b481ec3..e1e4f729 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
@@ -28,4 +28,6 @@ public interface SaasBasicDictService {
     ApiResult<Boolean> update(BasicDictUpdateReq req);
 
     ApiResult<Boolean> updateStauts(BasicDictUpdateStatusReq req);
+
+    ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids);
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
index 3479a01e..1d1aacf7 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
@@ -120,4 +120,9 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
     public ApiResult<BasicDictNodeResp> getById(Long id) {
         return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class));
     }
+
+    @Override
+    public ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids) {
+        return ApiResult.ok(BeanMapper.copyList(saasBasicDictDao.listByIds(ids), BasicDictNodeResp.class));
+    }
 }