From a049dda2f63d59f5092994b44387fe0aa889d375 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 15:01:04 +0800
Subject: [PATCH] 固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
index 743671e..6bf350d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
@@ -92,5 +92,38 @@
return annotation;
}
+ public String[] getAnnotationStartAndEnd(String machineGroupCode,List<Dict> annotationList) {
+
+ String begin = "(";
+ String end = ")";
+
+ Optional<Dict> dictOpt = annotationList.stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = DEFAULT_ANNOTATION_SETTING;
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getRemark();
+ }
+ String[] arr = StringUtils.split(annotationSetting,",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }else if(arr.length == 1){
+ begin = arr[0];
+ end = "";
+ }
+
+
+ return new String[]{begin,end};
+ }
+
+ public String removeAnnotation(String machineGroupCode,String text,String begin,String end){
+ List<Dict> annoDicts = getAnnotionList();
+ String[] arr = getAnnotationStartAndEnd(machineGroupCode,annoDicts);
+ return removeAnnotationInner(text,begin,end);
+ }
+
+ public static String removeAnnotationInner(String text,String begin,String end){
+ String temp = StringUtils.removeEnd(StringUtils.removeStart(text,begin),end);
+ return temp;
+ }
}
--
Gitblit v1.9.3