From e70c88930c51c7afeb3cc2ac72fbe6fad86a942c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 16:35:25 +0800
Subject: [PATCH] 注释都是括号问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
index 7e6ca99..efe0466 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
@@ -1,5 +1,6 @@
package org.springblade.mdm.program.service.programannotation;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.mdm.utils.FileContentUtil;
@@ -17,10 +18,50 @@
private ProgramAnnotationService programAnnotationService;
protected AnnotationProperties annotationProperties;
+ @Override
+ public InputStream putSendPathAnnotation(String sendPath, InputStream inputStream,List<DictBiz> annoDicts) throws IOException{
+ InputStream finishedStream;
+ try(inputStream){
+ ByteArrayInputStream byteInputStream = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
+ //1鍔犲叆鍙戦�佽矾寰勭殑娉ㄩ噴
+ String sendPathAnnotation = AnnotationUtil.generateAnnotation(sendPath,getControlSystem(),annoDicts);//鍔犱簡娉ㄩ噴涔嬪悗鐨勬枃鏈�
+
+ String sendDirLine = FileContentUtil.readLineAt(byteInputStream,annotationProperties.getSendPathLineIndex());//绗�2琛屾槸鍙戦�佽矾寰�
+ byteInputStream.reset();
+
+ if(AnnotationUtil.isAnnotation(sendDirLine,getControlSystem(),annoDicts)){
+ finishedStream = FileContentUtil.replaceAtLine(byteInputStream,annotationProperties.getSendPathLineIndex(),sendPathAnnotation);
+ }else{
+ finishedStream = FileContentUtil.insertLine(byteInputStream,annotationProperties.getSendPathLineIndex(),sendPathAnnotation);
+ }
+ finishedStream.reset();
+ }
+
+ return finishedStream;
+
+ }
+ @Override
+ public InputStream putFilenameAnnotation(String fileName, InputStream inputStream) throws IOException {
+ List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
+ ByteArrayInputStream bais = new ByteArrayInputStream(com.qiniu.util.IOUtils.toByteArray(inputStream));
+
+ String line = FileContentUtil.readLineAt(bais, annotationProperties.getProgramNameLineIndex());
+ bais.reset();
+ boolean isAnnotation = AnnotationUtil.isAnnotation(line,this.getControlSystem(),annoDicts);
+ InputStream insAfter;
+ //鍔犲叆绋嬪簭鍚嶆敞閲婅
+ String proNameLine = AnnotationUtil.generateAnnotation(FilenameUtils.removeExtension(fileName),getControlSystem(),annoDicts);
+ if(isAnnotation){
+ insAfter = FileContentUtil.replaceAtLine(bais, annotationProperties.getProgramNameLineIndex(),proNameLine);
+ }else{
+ insAfter = FileContentUtil.insertLine(bais, annotationProperties.getProgramNameLineIndex(),proNameLine);
+ }
+ return insAfter;
+ }
@Override
- public InputStream setAnnotation(AnnotationData annoData,InputStream inputStream) throws IOException {
+ public InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException {
List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
InputStream finishedStream;
@@ -28,6 +69,7 @@
ByteArrayInputStream byteInputStream = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
//1鍔犲叆鍙戦�佽矾寰勭殑娉ㄩ噴
+ /*
String sendPathAnnotation = AnnotationUtil.generateAnnotation(annoData.getSendPath(),getControlSystem(),annoDicts);//鍔犱簡娉ㄩ噴涔嬪悗鐨勬枃鏈�
String sendDirLine = FileContentUtil.readLineAt(byteInputStream,annotationProperties.getSendPathLineIndex());//绗�2琛屾槸鍙戦�佽矾寰�
@@ -43,6 +85,13 @@
}
insAfterSetSendDir.reset();
+ */
+
+ InputStream insAfterSetSendDir = putSendPathAnnotation(annoData.getSendPath(),byteInputStream,annoDicts);
+
+ String statusLine = FileContentUtil.readLineAt(insAfterSetSendDir,annotationProperties.getStatusLineIndex());//鐘舵�佹敞閲�
+ insAfterSetSendDir.reset();
+
//鍔犲叆鐘舵�佹敞閲婅
String statusAnnotation = AnnotationUtil.generateAnnotation(annoData.getProgramStatus(),getControlSystem(),annoDicts);//娉ㄩ噴鍚庣殑鐘舵�佹枃鏈�
if(AnnotationUtil.isAnnotation(statusLine,getControlSystem(),annoDicts)){
@@ -63,6 +112,10 @@
this.annotationProperties= annotationProperties;
}
+ @Override
+ public AnnotationProperties getAnnotationProperties(){
+ return annotationProperties;
+ }
public abstract String getControlSystem();
}
--
Gitblit v1.9.3