From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 3d715fd..8d7334c 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
@@ -7,6 +7,8 @@
import org.jetbrains.annotations.NotNull;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.commons.service.MdmDictBizService;
+import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
import org.springblade.mdm.program.vo.ProgramAnnotation;
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.feign.IDictBizClient;
@@ -32,29 +34,29 @@
@Autowired
private IDictBizClient bizDictClient;
-
- private static final String DEFAULT_ANNOTATION_SETTING = "(,)";
+ @Autowired
+ private MdmDictBizService mdmDictBizService;
+ //private static final String DEFAULT_ANNOTATION_SETTING = "(,)";
public static final String ANNOTATION_DICT = "machine_annotation";
/**
* 鍙戦�佺洰褰曡绱㈠紩锛堢2琛岋級 0 based
*/
- public static final int SENDPATH_LINE_INDEX = 1;
+ ///public static final int SENDPATH_LINE_INDEX = 2;
/**
* 鐘舵�佽绱㈠紩锛堢涓夎锛� 0 based
*/
- public static final int STATUS_LINE_INDEX = 2;
+ //public static final int STATUS_LINE_INDEX = 3;
/**
* 鍋忕鍗曟敞閲婅绱㈠紩鍙� 0 based
*/
- public static final int STATUS_DEVIATION_INDEX = 3;
+ //public static final int STATUS_DEVIATION_INDEX = 4;
- public static final String SQ = "SQ";
- public static final String GH = "GH";
- public static final String PL = "PL";
+
public List<DictBiz> getAnnotionDictList(){
+ /*
List<DictBiz> annotationList;
R<List<DictBiz>> dictBizResult = bizDictClient.getList(ANNOTATION_DICT);
@@ -64,7 +66,8 @@
annotationList = Collections.emptyList();
}
- return annotationList;
+ return annotationList;*/
+ return mdmDictBizService.getList(ANNOTATION_DICT);
}
@@ -74,6 +77,7 @@
* @param annotationList 娉ㄩ噴娉ㄩ噴瀛楀吀椤瑰垪琛�
* @return
*/
+ /*
public boolean isAnnotation(String line,String systemDictVal,List<DictBiz> annotationList){
ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(systemDictVal,annotationList);
@@ -86,7 +90,7 @@
public String generateAnnotation(String oriTest,String systemDictVal,List<DictBiz> annotationList) {
ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(systemDictVal,annotationList);
return progAnnotation.addAnnotation(oriTest);
- }
+ }*/
/**
* 鎻愬彇娉ㄩ噴涓殑鏂囨湰
@@ -94,13 +98,13 @@
* @param text 娓呴櫎娉ㄩ噴鏍囪
* @return 娓呴櫎鍚庣殑鏂囨湰
*/
+
public String removeAnnotation(String systemDictVal,String text){
List<DictBiz> annoDicts = getAnnotionDictList();
return removeAnnotation(systemDictVal,text,annoDicts);
}
-
public String removeAnnotation(String systemDictVal,String text,List<DictBiz> annotatiionList){
- ProgramAnnotation panno = this.getProgramAnnotationFormat(systemDictVal,annotatiionList);
+ ProgramAnnotation panno = AnnotationUtil.getProgramAnnotationFormat(systemDictVal,annotatiionList);
return panno.cleanAnnotation(text);
}
/**
@@ -111,9 +115,10 @@
* @return 鍔犲ソ娉ㄩ噴鐨�
* @throws IOException
*/
+ /*
public InputStream setGHAnnotation(InputStream inputStream, String systemDictVal,List<DictBiz> annoDictList) throws IOException {
return setAnnotationAndGetInputStream(inputStream, systemDictVal, annoDictList, GH, STATUS_LINE_INDEX);
- }
+ }*/
/**
* 璁剧疆鍋忕鍗曟敞閲�
@@ -123,10 +128,12 @@
* @return 鍔犲ソ娉ㄩ噴鐨勮緭鍏ユ祦
* @throws IOException 璁块棶娴佸彲鑳芥姏鍑哄紓甯�
*/
+ /*
public InputStream setPldAnnotation(String deviation,InputStream inputStream,String systemDictVal,List<DictBiz> annoDictList) throws IOException {
return setAnnotationAndGetInputStream(inputStream, systemDictVal, annoDictList, deviation, STATUS_DEVIATION_INDEX);
}
-
+ */
+ /*
@NotNull
private InputStream setAnnotationAndGetInputStream(InputStream inputStream, String systemDictVal, List<DictBiz> annoDictList, String text, int lineIndex) throws IOException {
InputStream finishedStream;
@@ -149,6 +156,7 @@
return finishedStream;
}
+ */
/**
* 涓鸿緭鍏ユ祦璁剧疆鍙戦�佺洰褰�(绗簩琛�)鍜岀姸鎬侊紙绗笁琛岋級
@@ -159,6 +167,7 @@
* @return 鍔犲ソ鍙戦�佽矾寰勫拰鐘舵�佹枃鏈殑杈撳叆娴�
* @throws IOException
*/
+ /*
public InputStream setSendDirAndStatusAnnotation(String sendPath,String statusText,InputStream inputStream, String systemDictVal) throws IOException {
List<DictBiz> annoDicts = getAnnotionDictList();
@@ -192,7 +201,7 @@
}
return finishedStream;
- }
+ }*/
/**
* 瑙ｆ瀽鍑烘満搴婄▼搴忔敞閲婄殑鏍煎紡
@@ -200,6 +209,7 @@
* @param annoDictList 閰嶇疆鐨勬敞閲婂瓧鍏告暟鎹�
* @return
*/
+ /*
ProgramAnnotation getProgramAnnotationFormat(String systemDictVal,List<DictBiz> annoDictList){
String begin;
String end;
@@ -224,7 +234,7 @@
programAnnotation.setBegin(begin);
programAnnotation.setEnd(end);
return programAnnotation;
- }
+ }*/
}
--
Gitblit v1.9.3