From 72bfff945d0d63749e36c361938727b32ac28d11 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 16 Nov 2023 18:21:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(REQ-1507):=20=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=93=E7=82=B9=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= 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、分类结点名称搜索实现； 影响： 无 --- .../main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java b/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java index f0294ea8..418846f8 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java @@ -154,7 +154,7 @@ public final class MessageRouterUtil { } private static void parseAndConcatButtonRouterUrl(List routeButtons, JSONObject routerParam) { - if (CollectionUtils.isNotEmpty(routeButtons)) { + if (CollectionUtils.isEmpty(routeButtons)) { return; } routeButtons.forEach(e -> { From e354051ac26aca7797e854949f6f6d185dcf1462 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 16 Nov 2023 18:50:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(REQ-1507):=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=88=86=E7=B1=BB=E5=8A=9F=E8=83=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= 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、模板移除分类功能问题处理； 影响： 无 --- .../message/service/impl/MessageTemplateGroupServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateGroupServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateGroupServiceImpl.java index 8dfca50e..c70ef079 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateGroupServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateGroupServiceImpl.java @@ -137,7 +137,6 @@ public class MessageTemplateGroupServiceImpl implements MessageTemplateGroupServ // 统计指定的模板编码关联的分类数量 Map templateCodeList = messageTemplateGroupDao.lambdaQuery() .in(MessageTemplateGroup::getTemplateCode, templateCodes) - .eq(MessageTemplateGroup::getPath, nodeCodePathMap.get(curGroupNodeCode)) .eq(MessageTemplateGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value) // 这里仅查询模板编码字段即可 .select(MessageTemplateGroup::getTemplateCode) From 4bff1927514ccc254573daa2c03d99761b4fb446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=B5=B7=E6=B4=8B?= Date: Thu, 16 Nov 2023 19:18:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?PushPendingMessageDTO=E5=A2=9E=E5=8A=A0id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/impl/PendingMessageNewServiceImpl.java | 1 + .../service/pending/response/PushPendingMessageDTO.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index 72b00035..5a4a4702 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -200,6 +200,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { pendingMessageRecordDao.saveBatch(record); // TODO 消息推送 @luofu return record.stream().map(e -> PushPendingMessageDTO.builder() + .id(e.getId()) .executorId(e.getExecutorId()) .executorPersonId(e.getExecutorPersonId()) .requestNo(e.getRequestNo()) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PushPendingMessageDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PushPendingMessageDTO.java index 400bd239..2f9c2fc6 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PushPendingMessageDTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PushPendingMessageDTO.java @@ -14,6 +14,11 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class PushPendingMessageDTO { + /** + * 消息记录ID + */ + private Long id; + /** * 请求批次号 */