From 56558ee76f0b3d5226afe6446e70975db698492f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 18:12:29 +0800
Subject: [PATCH] 增加工控网导入 历史 查看文件功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index aa96d07..95054b2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -26,6 +26,7 @@
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.DncSendBackFile;
import org.springblade.mdm.utils.FileContentUtil;
+import org.springblade.mdm.utils.ZipTextFileContentUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -36,7 +37,6 @@
import java.nio.file.StandardOpenOption;
import java.time.Duration;
import java.util.*;
-import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -357,6 +357,9 @@
public String getEntryFileContent(String entryName) throws IOException {
String result = "";
String zipFileName = bladeRedis.get(getFileKey());
+ return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(zipFileName),entryName);
+
+ /*
try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){
Path tempZipFile = createTempFile(inputStream);
@@ -386,7 +389,7 @@
}
}
- return result;
+ return result;*/
}
}
--
Gitblit v1.9.3