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

update - 字典list 接口增加通过 ID 获取

Browse Source
This commit is contained in:
wangli 2023-09-11 15:06:29 +08:00
parent e380d0c942
commit aae9578fac
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,4 @@ public interface SaasBasicDictApi {
@GetMapping("api/dict/get") @GetMapping("api/dict/get")
ApiResult<BasicDictNodeResp> get(@RequestParam Long id); ApiResult<BasicDictNodeResp> get(@RequestParam Long id);
@GetMapping("api/dict/get-by-ids")
ApiResult<List<BasicDictNodeResp>> getByIds(@RequestParam List<Long> ids) ;
} }

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

@ -8,6 +8,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.List;
/** /**
* @author： chenwenjian * @author： chenwenjian
* @date： 2023/9/6 14:02 * @date： 2023/9/6 14:02
@ -21,6 +23,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class BasicDictQueryReq { public class BasicDictQueryReq {
private List<Long> ids;
private Long parentId; private Long parentId;
/** /**

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

@ -62,8 +62,4 @@ public class SaasBasicDictController implements SaasBasicDictApi {
return saasBasicDictService.getById(id); return saasBasicDictService.getById(id);
} }
@Override
public ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids) {
return saasBasicDictService.getByIds(ids);
}
} }

11
tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java
View File

@ -9,6 +9,7 @@ import cn.axzo.tyr.server.repository.mapper.SaasBasicDictMapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -25,10 +26,12 @@ public class SaasBasicDictDao extends ServiceImpl<SaasBasicDictMapper, SaasBasic
public List<BasicDictNodeResp> getBasicDictNodeList(BasicDictQueryReq req) { public List<BasicDictNodeResp> getBasicDictNodeList(BasicDictQueryReq req) {
LambdaQueryChainWrapper<SaasBasicDict> queryChainWrapper = lambdaQuery(); LambdaQueryChainWrapper<SaasBasicDict> queryChainWrapper = lambdaQuery();
if (Objects.nonNull(req)){ if (Objects.nonNull(req)) {
queryChainWrapper.eq(Objects.nonNull(req.getParentId()), SaasBasicDict::getParentId, req.getParentId()) queryChainWrapper
.eq(Objects.nonNull(req.getWorkspaceType()), SaasBasicDict::getWorkspaceType, Objects.nonNull(req.getWorkspaceType())?req.getWorkspaceType().getValue():"") .eq(!CollectionUtils.isEmpty(req.getIds()), SaasBasicDict::getId, req.getIds())
.eq(Objects.nonNull(req.getType()), SaasBasicDict::getType, Objects.nonNull(req.getType())?req.getType().getValue():"") .eq(Objects.nonNull(req.getParentId()), SaasBasicDict::getParentId, req.getParentId())
.eq(Objects.nonNull(req.getWorkspaceType()), SaasBasicDict::getWorkspaceType, Objects.nonNull(req.getWorkspaceType()) ? req.getWorkspaceType().getValue() : "")
.eq(Objects.nonNull(req.getType()), SaasBasicDict::getType, Objects.nonNull(req.getType()) ? req.getType().getValue() : "")
.eq(Objects.nonNull(req.getCode()), SaasBasicDict::getCode, req.getCode()) .eq(Objects.nonNull(req.getCode()), SaasBasicDict::getCode, req.getCode())
.eq(Objects.nonNull(req.getStatus()), SaasBasicDict::getStatus, Boolean.TRUE.equals(req.getStatus()) ? 1 : 0) .eq(Objects.nonNull(req.getStatus()), SaasBasicDict::getStatus, Boolean.TRUE.equals(req.getStatus()) ? 1 : 0)
.like(Objects.nonNull(req.getName()), SaasBasicDict::getName, req.getName()); .like(Objects.nonNull(req.getName()), SaasBasicDict::getName, req.getName());

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

@ -29,5 +29,4 @@ public interface SaasBasicDictService {
ApiResult<Boolean> updateStauts(BasicDictUpdateStatusReq req); ApiResult<Boolean> updateStauts(BasicDictUpdateStatusReq req);
ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids);
} }

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

@ -121,8 +121,4 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class)); return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class));
} }
@Override
public ApiResult<List<BasicDictNodeResp>> getByIds(List<Long> ids) {
return ApiResult.ok(BeanMapper.copyList(saasBasicDictDao.listByIds(ids), BasicDictNodeResp.class));
}
} }