From a97946f52f222d0cad99b27c739597ed1db0df67 Mon Sep 17 00:00:00 2001 From: yanglin Date: Mon, 28 Oct 2024 14:48:53 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3045:=20IM=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/v3/msg/MessageTemplateParserV3.java | 4 ++-- .../msg/center/message/service/impl/v3/ModelV3Parser.java | 4 ++-- .../center/message/service/todo/TodoRangeQueryService.java | 4 ++-- .../msg/center/message/service/todo/TodoRespBuilder.java | 6 +++--- .../{ParsedModel3Walker.java => ParsedModelV3Walker.java} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/{ParsedModel3Walker.java => ParsedModelV3Walker.java} (99%) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageTemplateParserV3.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageTemplateParserV3.java index 7b56930c..21c5c44d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageTemplateParserV3.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageTemplateParserV3.java @@ -22,7 +22,7 @@ import cn.axzo.msg.center.service.enums.KVContentType; import cn.axzo.msg.center.service.enums.RouterCategoryEnum; import cn.axzo.msg.center.service.enums.TerminalTypeEnum; import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Visitor; -import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Walker; +import cn.axzo.msg.center.service.pending.response.v3.ParsedModelV3Walker; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedButtonV3; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedGroupV3; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedKV; @@ -68,7 +68,7 @@ public class MessageTemplateParserV3 { JSONObject routerParam = message.getRouterParams(); ParsedModelV3 parsedModel = modelV3Parser.parseModel(templateModel, message, message.getBizExtParams(), routerParam, routerParam, null); - ParsedModel3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { + ParsedModelV3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { @Override public void visitTemplateCardUrlConfig(UrlConfig urlConfig) { diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java index 19b35a36..8c2c8ff2 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java @@ -15,7 +15,7 @@ import cn.axzo.msg.center.service.enums.GroupType; import cn.axzo.msg.center.service.enums.KVContentType; import cn.axzo.msg.center.service.pending.ClientRequest; import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Visitor; -import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Walker; +import cn.axzo.msg.center.service.pending.response.v3.ParsedModelV3Walker; import cn.axzo.msg.center.service.pending.response.v3.model.ComponentWorkerGroup; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedButtonV3; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedGroupDetail; @@ -76,7 +76,7 @@ public class ModelV3Parser { parsedModel.setGroups(copyGroups(templateModel.getGroups())); parsedModel.setButtons(BeanMapper.copyList(templateModel.getButtons(), ParsedButtonV3.class)); UrlParser urlParser = new UrlParser(entity, routerParam, appendRouterParam); - ParsedModel3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { + ParsedModelV3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { @Override public void visitTemplateCardUrlConfig(UrlConfig urlConfig) { diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java index 7074b1d0..eb40dccf 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java @@ -43,7 +43,7 @@ import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticRespon import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponseV2.Stat; import cn.axzo.msg.center.service.pending.response.PersonTodoToBeDoneStatResponse; import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Visitor; -import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Walker; +import cn.axzo.msg.center.service.pending.response.v3.ParsedModelV3Walker; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedGroupV3; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedKV; import cn.axzo.msg.center.utils.DateFormatUtil; @@ -124,7 +124,7 @@ public class TodoRangeQueryService { if (response.getModelV3() != null) { response.getModelV3().getButtons() .removeIf(btn -> !btn.hasStyle(ButtonStyleEnum.OVER_CARD)); - ParsedModel3Walker.walkDown(response.getModelV3(), new ParsedModel3Visitor() { + ParsedModelV3Walker.walkDown(response.getModelV3(), new ParsedModel3Visitor() { @Override public void visitGroupKeyValue(ParsedGroupV3 group, ParsedKV kv) { keyValues.add(kv); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java index 503a5fbe..c042b895 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java @@ -22,7 +22,7 @@ import cn.axzo.msg.center.service.pending.ModelVersion; import cn.axzo.msg.center.service.pending.response.PendingMessageResponse; import cn.axzo.msg.center.service.pending.response.PendingMessageSimpleDTO; import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Visitor; -import cn.axzo.msg.center.service.pending.response.v3.ParsedModel3Walker; +import cn.axzo.msg.center.service.pending.response.v3.ParsedModelV3Walker; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedCardUrl; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedModelV3; import cn.axzo.msg.center.service.template.response.MessageDetailStyle; @@ -252,7 +252,7 @@ class TodoRespBuilder { response.setModelV3(parsedModel); response.setDisplayOnCardKeyValues(parsedModel.determineDisplayOnCardKeyValues()); response.setCardUrlOpenStrategy(templateModel.getTemplate().getCardUrlOpenStrategy()); - ParsedModel3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { + ParsedModelV3Walker.walkDown(parsedModel, new ParsedModel3Visitor() { @Override public void visitTemplateCardUrlConfig(UrlConfig urlConfig) { ParsedCardUrl cardUrl = new ParsedCardUrl(); @@ -267,7 +267,7 @@ class TodoRespBuilder { } else { ModelVersion version = ModelVersion.from(request); if (version.is(ModelVersion.V2) || version.is(ModelVersion.ALL)) - ParsedModel3Walker.walkDown(parsedModel, + ParsedModelV3Walker.walkDown(parsedModel, new ModelV2PropsPopulator(cfg, response, request)); if (version.is(ModelVersion.V3) || version.is(ModelVersion.ALL)) modelV3Builder.run(); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModel3Walker.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModelV3Walker.java similarity index 99% rename from msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModel3Walker.java rename to msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModelV3Walker.java index b9667e52..e3ac7b60 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModel3Walker.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ParsedModelV3Walker.java @@ -14,7 +14,7 @@ import java.util.ArrayList; /** * @author yanglin */ -public class ParsedModel3Walker { +public class ParsedModelV3Walker { public static void walkDown(ParsedModelV3 model, ParsedModel3Visitor visitor) { if (model == null) return;