From aae9578fac79daae3bf4bc26b674a638e055dbc8 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 11 Sep 2023 15:06:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=AD=97=E5=85=B8list=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=80=9A=E8=BF=87=20ID=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/feign/SaasBasicDictApi.java | 2 -- .../client/model/dict/request/BasicDictQueryReq.java | 4 ++++ .../controller/dict/SaasBasicDictController.java | 4 ---- .../axzo/tyr/server/repository/SaasBasicDictDao.java | 11 +++++++---- .../axzo/tyr/server/service/SaasBasicDictService.java | 1 - .../server/service/impl/SaasBasicDictServiceImpl.java | 4 ---- 6 files changed, 11 insertions(+), 15 deletions(-) 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 3cec8ab8..b6d3ff30 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 @@ -84,6 +84,4 @@ 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 ddb1708f..f4a56deb 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 @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author： chenwenjian * @date： 2023/9/6 14:02 @@ -21,6 +23,8 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class BasicDictQueryReq { + private List ids; + private Long parentId; /** 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 9fda27b6..c8715a08 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 @@ -62,8 +62,4 @@ public class SaasBasicDictController implements SaasBasicDictApi { 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/repository/SaasBasicDictDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java index 4ce7e168..ea881629 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java @@ -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.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; @@ -25,10 +26,12 @@ public class SaasBasicDictDao extends ServiceImpl getBasicDictNodeList(BasicDictQueryReq req) { LambdaQueryChainWrapper queryChainWrapper = lambdaQuery(); - if (Objects.nonNull(req)){ - queryChainWrapper.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():"") + if (Objects.nonNull(req)) { + queryChainWrapper + .eq(!CollectionUtils.isEmpty(req.getIds()), SaasBasicDict::getId, req.getIds()) + .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.getStatus()), SaasBasicDict::getStatus, Boolean.TRUE.equals(req.getStatus()) ? 1 : 0) .like(Objects.nonNull(req.getName()), SaasBasicDict::getName, req.getName()); 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 e1e4f729..397658b6 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 @@ -29,5 +29,4 @@ public interface SaasBasicDictService { 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 1d1aacf7..9644a1bf 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 @@ -121,8 +121,4 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { 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)); - } }