Merge branch 'feature/REQ-1212' into feature/REQ-1102

tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java

@@ -1,10 +1,9 @@
 package cn.axzo.tyr.client.feign;
 
 import cn.axzo.framework.domain.web.result.ApiResult;
-import cn.axzo.tyr.client.model.dict.request.BasicDictCreateReq;
+import cn.axzo.tyr.client.common.annotation.EnumValidator;
-import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.DictTypeFiledEnum;
-import cn.axzo.tyr.client.model.dict.request.BasicDictUpdateReq;
+import cn.axzo.tyr.client.model.dict.request.*;
-import cn.axzo.tyr.client.model.dict.request.BasicDictUpdateStatusReq;
 import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -30,7 +29,27 @@ public interface SaasBasicDictApi {
      * @return
      */
     @PostMapping("api/dict/node-list")
-    ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(@RequestBody BasicDictQueryReq req);
+    ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(@RequestBody @Validated BasicDictQueryReq req);
+
+    /**
+     * 获取字典树，需要单测树时才传type
+     *
+     * @param type
+     * @return
+     */
+    @PostMapping("api/dict/node-tree")
+    ApiResult<List<BasicDictNodeResp>> getBasicDictNodeTree(@RequestBody
+                                                            @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
+                                                            DictTypeFiledEnum type);
+
+    /**
+     * 获取字典节点详情
+     *
+     * @param req 传入type和code
+     * @return
+     */
+    @PostMapping("api/dict/node")
+    ApiResult<BasicDictNodeResp> getBasicDictNode(@RequestBody @Validated BasicDictNodeReq req);
 
     /**
      * 添加字典

tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictNodeReq.java

@@ -1,9 +1,9 @@
 package cn.axzo.tyr.client.model.dict.request;
 
+import cn.axzo.tyr.client.common.annotation.EnumValidator;
+import cn.axzo.tyr.client.model.DictTypeFiledEnum;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author： chenwenjian
  * @date： 2023/9/6 15:46
@@ -14,16 +14,12 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class BasicDictNodeReq {
 
-    /**
-     * 工作台类型
-     */
-    @NotBlank(message = "工作台类型不能为空")
-    private String workspaceType;
-
     /**
      * 类型
      */
-    @NotBlank(message = "类型不能为空")
+    @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
-    private String type;
+    private DictTypeFiledEnum type;
+
+    private String code;
 
 }

tyr-api/src/main/java/cn/axzo/tyr/client/model/dict/request/BasicDictQueryReq.java

@@ -1,8 +1,8 @@
 package cn.axzo.tyr.client.model.dict.request;
 
 import cn.axzo.tyr.client.common.annotation.EnumValidator;
-import cn.axzo.tyr.client.common.enums.DictTypeFiledEnum;
+import cn.axzo.tyr.client.model.DictTypeFiledEnum;
-import cn.axzo.tyr.client.common.enums.DictWorkSpaceTypeEnum;
+import cn.axzo.tyr.client.model.DictWorkSpaceTypeEnum;
 import lombok.Data;
 
 /**

tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictTypeFiledEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.client.common.enums;
+package cn.axzo.tyr.client.model;
 
 import java.util.Arrays;
 

tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.client.common.enums;
+package cn.axzo.tyr.client.model;
 
 import java.util.Arrays;
 

tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java

@@ -1,11 +1,9 @@
-package cn.axzo.tyr.server.controller;
+package cn.axzo.tyr.server.controller.dict;
 
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.SaasBasicDictApi;
-import cn.axzo.tyr.client.model.dict.request.BasicDictCreateReq;
+import cn.axzo.tyr.client.model.DictTypeFiledEnum;
-import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.request.*;
-import cn.axzo.tyr.client.model.dict.request.BasicDictUpdateReq;
-import cn.axzo.tyr.client.model.dict.request.BasicDictUpdateStatusReq;
 import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import cn.axzo.tyr.server.service.SaasBasicDictService;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +28,16 @@ public class SaasBasicDictController implements SaasBasicDictApi {
 
     @Override
     public ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req) {
+        return saasBasicDictService.getBasicDictNodeList(req);
+    }
+
+    @Override
+    public ApiResult<List<BasicDictNodeResp>> getBasicDictNodeTree(DictTypeFiledEnum type) {
+        return null;
+    }
+
+    @Override
+    public ApiResult<BasicDictNodeResp> getBasicDictNode(BasicDictNodeReq req) {
         return null;
     }
 

tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java

@@ -1,5 +1,11 @@
 package cn.axzo.tyr.server.service;
 
+import cn.axzo.framework.domain.web.result.ApiResult;
+import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
+
+import java.util.List;
+
 /**
  * @author： chenwenjian
  * @date： 2023/9/7 17:54
@@ -8,4 +14,5 @@ package cn.axzo.tyr.server.service;
  * @version: 1.0
  */
 public interface SaasBasicDictService {
+    ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req);
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java

@@ -1,11 +1,16 @@
 package cn.axzo.tyr.server.service.impl;
 
+import cn.axzo.framework.domain.web.result.ApiResult;
+import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import cn.axzo.tyr.server.repository.SaasBasicDictDao;
 import cn.axzo.tyr.server.service.SaasBasicDictService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author： chenwenjian
  * @date： 2023/9/8 15:40
@@ -20,4 +25,9 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
 
     private final SaasBasicDictDao saasBasicDictDao;
 
+    @Override
+    public ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req) {
+
+        return null;
+    }
 }