From 2a6c600abcc3dd42180ec011f83970e63d2d7a11 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 9 Nov 2023 11:41:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E5=88=86=E7=B1=BB=E7=BB=93?= =?UTF-8?q?=E7=82=B9=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 修改： 1、消息分类树结点新增结点图标字段； 影响： 无 --- .../msg/center/message/controller/MessageGroupController.java | 4 ++-- .../msg/center/service/group/client/MessageGroupClient.java | 4 ++-- .../group/client/fallback/MessageGroupClientFallback.java | 4 ++-- ...ageGroupPageRequest.java => MessageGroupQueryRequest.java} | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) rename msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/{MessageGroupPageRequest.java => MessageGroupQueryRequest.java} (81%) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageGroupController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageGroupController.java index c9d64d70..92d7d7e4 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageGroupController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageGroupController.java @@ -6,7 +6,7 @@ import cn.axzo.msg.center.service.dto.GroupTreeNodeDTO; import cn.axzo.msg.center.service.group.client.MessageGroupClient; import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; import cn.axzo.msg.center.service.group.request.MessageGroupNodeUpdateRequest; -import cn.axzo.msg.center.service.group.request.MessageGroupPageRequest; +import cn.axzo.msg.center.service.group.request.MessageGroupQueryRequest; import cn.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse; import cn.azxo.framework.common.model.CommonResponse; import lombok.RequiredArgsConstructor; @@ -47,7 +47,7 @@ public class MessageGroupController implements MessageGroupClient { } @Override - public CommonResponse> list(MessageGroupPageRequest request) { + public CommonResponse> list(MessageGroupQueryRequest request) { List groupTreeNodes = messageGroupNodeService .listGroupTree(request.getCategory(), request.getNodeName()).stream() .map(GroupTreeNodeDTO::toMessageGroupTreeNodeResponse) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/MessageGroupClient.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/MessageGroupClient.java index 0bd8d779..3f9ad39a 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/MessageGroupClient.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/MessageGroupClient.java @@ -3,7 +3,7 @@ package cn.axzo.msg.center.service.group.client; import cn.axzo.msg.center.service.group.client.fallback.MessageGroupClientFallback; import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; import cn.axzo.msg.center.service.group.request.MessageGroupNodeUpdateRequest; -import cn.axzo.msg.center.service.group.request.MessageGroupPageRequest; +import cn.axzo.msg.center.service.group.request.MessageGroupQueryRequest; import cn.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse; import cn.azxo.framework.common.model.CommonResponse; import org.springframework.cloud.openfeign.FeignClient; @@ -60,5 +60,5 @@ public interface MessageGroupClient { * @param request 分页查询相关参数 */ @PostMapping(value = "/message/group/node/list", produces = {MediaType.APPLICATION_JSON_VALUE}) - CommonResponse> list(@RequestBody MessageGroupPageRequest request); + CommonResponse> list(@RequestBody MessageGroupQueryRequest request); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/fallback/MessageGroupClientFallback.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/fallback/MessageGroupClientFallback.java index 84a6855f..d94512c5 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/fallback/MessageGroupClientFallback.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/fallback/MessageGroupClientFallback.java @@ -3,7 +3,7 @@ package cn.axzo.msg.center.service.group.client.fallback; import cn.axzo.msg.center.service.group.client.MessageGroupClient; import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; import cn.axzo.msg.center.service.group.request.MessageGroupNodeUpdateRequest; -import cn.axzo.msg.center.service.group.request.MessageGroupPageRequest; +import cn.axzo.msg.center.service.group.request.MessageGroupQueryRequest; import cn.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse; import cn.azxo.framework.common.model.CommonResponse; import lombok.extern.slf4j.Slf4j; @@ -40,7 +40,7 @@ public class MessageGroupClientFallback implements MessageGroupClient { } @Override - public CommonResponse> list(MessageGroupPageRequest request) { + public CommonResponse> list(MessageGroupQueryRequest request) { log.error("fall back while listing message group node. request:{}", request); return CommonResponse.error("fall back while listing message group node"); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupPageRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupQueryRequest.java similarity index 81% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupPageRequest.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupQueryRequest.java index 280d096b..a2b47c53 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupPageRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupQueryRequest.java @@ -1,6 +1,5 @@ package cn.axzo.msg.center.service.group.request; -import cn.axzo.core.domain.PageRequest; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import com.alibaba.fastjson.JSON; import lombok.Getter; @@ -13,7 +12,7 @@ import lombok.Setter; */ @Setter @Getter -public class MessageGroupPageRequest extends PageRequest { +public class MessageGroupQueryRequest { private MessageGroupCategoryEnum category; private String nodeName;