diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TemplateUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TemplateUtil.java index 9a663397..aea68a54 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TemplateUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TemplateUtil.java @@ -87,12 +87,12 @@ public class TemplateUtil { for (String key : keys) { contents.add(ReUtil.getGroup1(StrUtil.format(pattern, key), templateContent)); } - String replaceStr=System.lineSeparator()+StrUtil.SPACE; + String replaceStr=System.lineSeparator(); String join = replaceStr+ "#"; templateContent = CollUtil.join(contents, join); String content = FreemarkerParseFactory .parseTemplateContent(templateContent, data, true); - messageDTO.setContent(content.replace(":",":"+replaceStr)); + messageDTO.setContent(content.replace(":",":"+replaceStr+StrUtil.SPACE)); String title = FreemarkerParseFactory.parseTemplateContent(templateName,stationData); messageDTO.setTitle(title); return messageDTO; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/Template.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/Template.java index f5a83446..8e9a5c02 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/Template.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/Template.java @@ -11,7 +11,7 @@ import lombok.Getter; public enum Template { IDC_DATASOURCE_STATUS("IDC_Datasource_Status"), MONITOR_SERVER("Monitor_Server"), MONITOR_EMAIL("Monitor_Email"), - MONITOR_DATABASE("Monitor_Database"), ANALYSIS_NUCLIDE("Analysis_Nuclide"),ANALYSIS_NUCLIDE_NAME("Analysis_Nuclide_Name"); + MONITOR_DATABASE("Monitor_Database"), ANALYSIS_NUCLIDE("Analysis_Nuclide"); private final String code; } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java index 1a6ab066..d8e1f3d8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java @@ -38,7 +38,7 @@ import org.springframework.stereotype.Component; import static org.jeecg.common.constant.enums.MessageTypeEnum.*; import static org.jeecg.common.util.TokenUtils.getTempToken; -import static org.jeecg.modules.base.enums.Template.ANALYSIS_NUCLIDE_NAME; +import static org.jeecg.modules.base.enums.Template.ANALYSIS_NUCLIDE; import java.math.BigDecimal; import java.time.LocalDate; @@ -257,7 +257,7 @@ public class AnalysisConsumer implements StreamListener