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 5d2b3291..e3169709 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.GetMapping; @@ -40,7 +41,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/controller/dict/SaasBasicDictController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java index 199fc1fa..a24ae21a 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 @@ -5,6 +5,7 @@ import cn.axzo.tyr.client.feign.SaasBasicDictApi; 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 cn.axzo.tyr.server.service.SaasBasicDictService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,8 +33,8 @@ public class SaasBasicDictController implements SaasBasicDictApi { } @Override - public ApiResult> getBasicDictNodeTree(DictTypeFiledEnum type) { - return null; + public ApiResult getBasicDictNodeTree(DictTypeFiledEnum type) { + return saasBasicDictService.getBasicDictNodeTree(type); } @Override 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 e7e27d6b..492b8bf2 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; @@ -18,5 +20,7 @@ import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; */ public interface SaasBasicDictService { ApiResult> getBasicDictNodeList(BasicDictQueryReq req); + + ApiResult getBasicDictNodeTree(DictTypeFiledEnum type); ApiResult getById(Long id); } 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 27b2fcb6..124b7374 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 @@ -2,8 +2,10 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.BeanMapper; 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; @@ -31,6 +33,11 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { return null; } + + @Override + public ApiResult getBasicDictNodeTree(DictTypeFiledEnum type) { + return null; + } @Override public ApiResult getById(Long id) { return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class));