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 2632f303..df5dfbd4 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 @@ -5,6 +5,7 @@ import cn.axzo.tyr.client.common.annotation.EnumValidator; import cn.axzo.tyr.client.model.DictTypeFiledEnum; import cn.axzo.tyr.client.model.dict.request.*; import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; +import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -38,7 +39,7 @@ public interface SaasBasicDictApi { * @return */ @PostMapping("api/dict/node-tree") - ApiResult> getBasicDictNodeTree(@RequestBody + ApiResult getBasicDictNodeTree(@RequestBody @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误") DictTypeFiledEnum type); 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 6a3c633a..c108655c 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 @@ -1,8 +1,10 @@ package cn.axzo.tyr.server.service; import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.tyr.client.model.DictTypeFiledEnum; import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq; import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; +import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp; import java.util.List; @@ -15,4 +17,6 @@ import java.util.List; */ public interface SaasBasicDictService { ApiResult> getBasicDictNodeList(BasicDictQueryReq req); + + ApiResult getBasicDictNodeTree(DictTypeFiledEnum type); } 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 8c8e10b0..b0f12f91 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 @@ -1,8 +1,10 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.tyr.client.model.DictTypeFiledEnum; import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq; import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; +import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp; import cn.axzo.tyr.server.repository.SaasBasicDictDao; import cn.axzo.tyr.server.service.SaasBasicDictService; import lombok.RequiredArgsConstructor; @@ -30,4 +32,9 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { return null; } + + @Override + public ApiResult getBasicDictNodeTree(DictTypeFiledEnum type) { + return null; + } }