wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

Browse Source 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
This commit is contained in:
wangli 2023-09-08 18:44:55 +08:00
commit 2eb2573fa4
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.DictTypeFiledEnum;
import cn.axzo.tyr.client.model.dict.request.*; 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.BasicDictNodeResp;
import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -40,7 +41,7 @@ public interface SaasBasicDictApi {
* @return * @return
*/ */
@PostMapping("api/dict/node-tree") @PostMapping("api/dict/node-tree")
ApiResult<List<BasicDictNodeResp>> getBasicDictNodeTree(@RequestBody ApiResult<BasicDictTreeResp> getBasicDictNodeTree(@RequestBody
@EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误") @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
DictTypeFiledEnum type); DictTypeFiledEnum type);

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

@ -5,6 +5,7 @@ import cn.axzo.tyr.client.feign.SaasBasicDictApi;
import cn.axzo.tyr.client.model.DictTypeFiledEnum; import cn.axzo.tyr.client.model.DictTypeFiledEnum;
import cn.axzo.tyr.client.model.dict.request.*; 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.BasicDictNodeResp;
import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp;
import cn.axzo.tyr.server.service.SaasBasicDictService; import cn.axzo.tyr.server.service.SaasBasicDictService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -32,8 +33,8 @@ public class SaasBasicDictController implements SaasBasicDictApi {
} }
@Override @Override
public ApiResult<List<BasicDictNodeResp>> getBasicDictNodeTree(DictTypeFiledEnum type) { public ApiResult<BasicDictTreeResp> getBasicDictNodeTree(DictTypeFiledEnum type) {
return null; return saasBasicDictService.getBasicDictNodeTree(type);
} }
@Override @Override

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

@ -1,8 +1,10 @@
package cn.axzo.tyr.server.service; package cn.axzo.tyr.server.service;
import cn.axzo.framework.domain.web.result.ApiResult; 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.request.BasicDictQueryReq;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp;
import java.util.List; import java.util.List;
@ -18,5 +20,7 @@ import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
*/ */
public interface SaasBasicDictService { public interface SaasBasicDictService {
ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req); ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req);
ApiResult<BasicDictTreeResp> getBasicDictNodeTree(DictTypeFiledEnum type);
ApiResult<BasicDictNodeResp> getById(Long id); ApiResult<BasicDictNodeResp> getById(Long id);
} }

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

@ -2,8 +2,10 @@ package cn.axzo.tyr.server.service.impl;
import cn.axzo.basics.common.BeanMapper; import cn.axzo.basics.common.BeanMapper;
import cn.axzo.framework.domain.web.result.ApiResult; 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.request.BasicDictQueryReq;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp; 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.repository.SaasBasicDictDao;
import cn.axzo.tyr.server.service.SaasBasicDictService; import cn.axzo.tyr.server.service.SaasBasicDictService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -31,6 +33,11 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
return null; return null;
} }
@Override
public ApiResult<BasicDictTreeResp> getBasicDictNodeTree(DictTypeFiledEnum type) {
return null;
}
@Override @Override
public ApiResult<BasicDictNodeResp> getById(Long id) { public ApiResult<BasicDictNodeResp> getById(Long id) {
return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class)); return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class));