From a3048fa6fa72fa3cc5da2c43c59bd000e00c9599 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 23:13:32 +0800
Subject: [PATCH] 工控网分析程序状态问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/DefaultProcessor.java | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/DefaultProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/DefaultProcessor.java
index eb2908a..26edd95 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/DefaultProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/DefaultProcessor.java
@@ -1,17 +1,11 @@
package org.springblade.mdm.program.service.programannotation;
-import com.qiniu.util.IOUtils;
-import org.apache.commons.io.FilenameUtils;
import org.springblade.mdm.program.service.ProgramAnnotationService;
-import org.springblade.mdm.utils.FileContentUtil;
-import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.List;
@Component("defaultProcessor")
@@ -23,26 +17,14 @@
@Override
- public InputStream setAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException {
- List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
- ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
+ public InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException {
+ InputStream insAfter = super.putFilenameAnnotation(annoData.getFilename(),inputStream);
- String line = FileContentUtil.readLineAt(bais, annotationProperties.getProgramNameLineIndex());
- bais.reset();
- boolean isAnnotation = AnnotationUtil.isAnnotation(line,controlSystem,annoDicts);
- InputStream insAfter;
- //鍔犲叆绋嬪簭鍚嶆敞閲婅
- String proNameLine = AnnotationUtil.generateAnnotation(FilenameUtils.removeExtension(annoData.getFilename()),getControlSystem(),annoDicts);
- if(isAnnotation){
- insAfter = FileContentUtil.replaceAtLine(bais, annotationProperties.getProgramNameLineIndex(),proNameLine);
- }else{
- insAfter = FileContentUtil.insertLine(bais, annotationProperties.getProgramNameLineIndex(),proNameLine);
- }
-
- return super.setAnnotation(annoData, insAfter);
+ return super.putAnnotation(annoData, insAfter);
}
+
@Override
public void setControlSystem(String controlSystemDictVal) {
this.controlSystem = controlSystemDictVal;
--
Gitblit v1.9.3