固化流程

yangys

2025-08-14 a049dda2f63d59f5092994b44387fe0aa889d375

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