wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-09 11:42:14 +08:00
commit b2e0e9ba2d
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageGroupController.java
View File

@ -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.client.MessageGroupClient;
import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; 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.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.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse;
import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.model.CommonResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -47,7 +47,7 @@ public class MessageGroupController implements MessageGroupClient {
} }
@Override @Override
public CommonResponse<List<MessageGroupTreeNodeResponse>> list(MessageGroupPageRequest request) { public CommonResponse<List<MessageGroupTreeNodeResponse>> list(MessageGroupQueryRequest request) {
List<MessageGroupTreeNodeResponse> groupTreeNodes = messageGroupNodeService List<MessageGroupTreeNodeResponse> groupTreeNodes = messageGroupNodeService
.listGroupTree(request.getCategory(), request.getNodeName()).stream() .listGroupTree(request.getCategory(), request.getNodeName()).stream()
.map(GroupTreeNodeDTO::toMessageGroupTreeNodeResponse) .map(GroupTreeNodeDTO::toMessageGroupTreeNodeResponse)

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/MessageGroupClient.java
View File

@ -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.client.fallback.MessageGroupClientFallback;
import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; 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.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.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse;
import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.model.CommonResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
@ -60,5 +60,5 @@ public interface MessageGroupClient {
* @param request 分页查询相关参数 * @param request 分页查询相关参数
*/ */
@PostMapping(value = "/message/group/node/list", produces = {MediaType.APPLICATION_JSON_VALUE}) @PostMapping(value = "/message/group/node/list", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<List<MessageGroupTreeNodeResponse>> list(@RequestBody MessageGroupPageRequest request); CommonResponse<List<MessageGroupTreeNodeResponse>> list(@RequestBody MessageGroupQueryRequest request);
} }

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/group/client/fallback/MessageGroupClientFallback.java
View File

@ -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.client.MessageGroupClient;
import cn.axzo.msg.center.service.group.request.MessageGroupNodeAddRequest; 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.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.axzo.msg.center.service.group.response.MessageGroupTreeNodeResponse;
import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.model.CommonResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -40,7 +40,7 @@ public class MessageGroupClientFallback implements MessageGroupClient {
} }
@Override @Override
public CommonResponse<List<MessageGroupTreeNodeResponse>> list(MessageGroupPageRequest request) { public CommonResponse<List<MessageGroupTreeNodeResponse>> list(MessageGroupQueryRequest request) {
log.error("fall back while listing message group node. request:{}", request); log.error("fall back while listing message group node. request:{}", request);
return CommonResponse.error("fall back while listing message group node"); return CommonResponse.error("fall back while listing message group node");
} }

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupPageRequest.java → msg-center-api/src/main/java/cn/axzo/msg/center/service/group/request/MessageGroupQueryRequest.java
View File

@ -1,6 +1,5 @@
package cn.axzo.msg.center.service.group.request; package cn.axzo.msg.center.service.group.request;
import cn.axzo.core.domain.PageRequest;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum; import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.Getter; import lombok.Getter;
@ -13,7 +12,7 @@ import lombok.Setter;
*/ */
@Setter @Setter
@Getter @Getter
public class MessageGroupPageRequest extends PageRequest { public class MessageGroupQueryRequest {
private MessageGroupCategoryEnum category; private MessageGroupCategoryEnum category;
private String nodeName; private String nodeName;