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 get(@RequestParam Long id); + + @GetMapping("api/dict/get-by-ids") + ApiResult> getByIds(@RequestParam List 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 get(Long id) { return saasBasicDictService.getById(id); } + + @Override + public ApiResult> getByIds(List 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 update(BasicDictUpdateReq req); ApiResult updateStauts(BasicDictUpdateStatusReq req); + + ApiResult> getByIds(List 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 getById(Long id) { return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class)); } + + @Override + public ApiResult> getByIds(List ids) { + return ApiResult.ok(BeanMapper.copyList(saasBasicDictDao.listByIds(ids), BasicDictNodeResp.class)); + } }