From 675d66f1cbc7e92cc0fb4897664ee3a851072334 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 00:06:35 +0800
Subject: [PATCH] 优化固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
index 87467cb..76e468e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
@@ -19,11 +19,10 @@
@Autowired
private ProgramAnnotationService programAnnotationService;
private String controlSystem;
- //AnnotationProperties annotationProperties;
private Pattern PATTERN = Pattern.compile("^[oO]\\d{4}");
private final int O_LINE = 1;
@Override
- public InputStream setAnnotation(AnnotationData annoData,InputStream inputStream) throws IOException {
+ public InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException {
//鍦∣0001 杩欑鏂囧瓧鍚庨潰澧炲姞鏂囦欢鍚嶏紙涓嶅甫鎵╁睍鍚嶏級
ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
String line = FileContentUtil.readLineAt(bais,O_LINE);
@@ -32,12 +31,12 @@
InputStream ins1;
if(oMatched){
List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
- String newline = line + generateAnnotation(FilenameUtils.removeExtension(annoData.getFilename()),getControlSystem(),annoDicts);
+ String newline = line + AnnotationUtil.generateAnnotation(FilenameUtils.removeExtension(annoData.getFilename()),getControlSystem(),annoDicts);
ins1 = FileContentUtil.replaceAtLine(bais,O_LINE,newline);
}else{
ins1 = bais;
}
- return super.setAnnotation(annoData, ins1);
+ return super.putAnnotation(annoData, ins1);
}
--
Gitblit v1.9.3