From 4b397a21eb979617f4fe9ff9fc1edb7a1be72900 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:45:29 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java | 56 ++++++++++++++------------------------------------------
1 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
index 9042c89..02d0988 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
@@ -1,58 +1,30 @@
package org.springblade.mdm.program.service.programannotation;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.mdm.program.service.ProgramAnnotationService;
-import org.springblade.mdm.program.vo.ProgramAnnotation;
import org.springblade.system.pojo.entity.DictBiz;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import java.util.Optional;
public interface AnnotationProcessor {
- static final String DEFAULT_ANNOTATION_SETTING = "(,)";
- default String generateAnnotation(String oriTest, String systemDictVal, List<DictBiz> annotationList) {
- ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(systemDictVal,annotationList);
- return progAnnotation.addAnnotation(oriTest);
- }
- default boolean isAnnotation(String line,String systemDictVal,List<DictBiz> annotationList){
- ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(systemDictVal,annotationList);
- line = StringUtils.trim(line);//鍘婚灏剧┖鏍�
- return progAnnotation.isAnnotation(line);
- }
-
- default ProgramAnnotation getProgramAnnotationFormat(String systemDictVal,List<DictBiz> annoDictList){
- String begin;
- String end;
-
- Optional<DictBiz> dictOpt = annoDictList.stream().filter(dict -> {return dict.getDictKey().equals(systemDictVal);}).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 = "";
- }else{
- throw new ServiceException("娉ㄩ噴鏍煎紡閰嶇疆閿欒锛屽簲璇ヤ负1鍒�2娈碉紝涓棿鐢ㄩ�楀彿鍒嗛殧");
- }
-
- ProgramAnnotation programAnnotation = new ProgramAnnotation();
- programAnnotation.setBegin(begin);
- programAnnotation.setEnd(end);
- return programAnnotation;
- }
void setControlSystem(String controlSystemDictVal);
void setAnnotationProperties(AnnotationProperties annotationProperties);
String getControlSystem();
- InputStream setAnnotation(AnnotationData annoData,InputStream inputStream) throws IOException;
+ InputStream putSendPathAnnotation(String sendPath, InputStream inputStream, List<DictBiz> annoDicts) throws IOException;
+
+ InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException;
+
+ InputStream putFilenameAnnotation(String programName, InputStream inputStream) throws IOException;
+
+ AnnotationProperties getAnnotationProperties();
+
+ /**
+ * 浠庤緭鍏ユ祦璇诲彇鍏ㄥannotation鏁版嵁
+ * @param inputStream 杈撳叆娴�
+ * @return 璇诲彇鐨勬暟鎹�
+ */
+ AnnotationData readAnnotationData(InputStream inputStream);
}
--
Gitblit v1.9.3