xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 删除Analysis_Nuclide_Name

Browse Source
This commit is contained in:
xiaoguangbin 2025-04-07 10:16:17 +08:00
parent 41763af080
commit 17b58e10c2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TemplateUtil.java
View File

@ -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;

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/Template.java
View File

@ -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;
}

4
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
View File

@ -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<String, ObjectRecord<Str
DataTool titleData = DataTool.getInstance();
titleData.put("stationCode",stationCode);
// 构建预警信息实例 准备发送预警信息,20250327--修改模版
MessageDTO messageDTO = TemplateUtil.parse1(ANALYSIS_NUCLIDE_NAME.getCode(), dataTool.get(),titleData.get());
MessageDTO messageDTO = TemplateUtil.parse1(ANALYSIS_NUCLIDE.getCode(), dataTool.get(),titleData.get());
// 保存报警日志
AlarmAnalysisLog logInfo = new AlarmAnalysisLog();
BeanUtil.copyProperties(info, logInfo);