From 12313d5b8a2b6eaa2c7562291cf08f23644ef1d7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:30:48 +0800
Subject: [PATCH] 解决回传工控网记录无法查看文件的问题
---
blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java | 10 ++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 8 +++++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 1 -
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index 0e8e925..9496300 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -75,7 +75,6 @@
@Operation(summary = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�", description = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�,鏌ヨ鍥炰紶鍘嗗彶")
@GetMapping("/dnc-back-page")
public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {
-
return R.data(dncBackFileService.pageQuery(query));
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
index 91d6a16..8660a66 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -17,6 +17,7 @@
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
@@ -49,6 +50,7 @@
@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
private final NcNodeService ncNodeService;
+ private final NcNodeHisService nodeHisService;
private final OssTemplate ossTemplate;
private final HistoryService historyService;
private final FlowBusinessService businessService;
@@ -107,9 +109,9 @@
InputStream inputStream = this.ossTemplate.statFileStream(backFIle.getOssName());
Path tempZipFile = createTempFile(inputStream);
- List<String> entryNameList = new ArrayList<>();
- NcNode packageNode = this.ncNodeService.getById(backFIle.getNcNodeId());
- String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
+ NcNodeHis packageNode = nodeHisService.getById(backFIle.getNcNodeId());
+ //String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
+ String targetFolder = packageNode.getName()+"/";
ZipEntry entry;
try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
Enumeration<? extends ZipEntry> entries = zipFile.entries();
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java
new file mode 100644
index 0000000..65f7cc2
--- /dev/null
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java
@@ -0,0 +1,10 @@
+package org.springblade.mdm.program.service;
+
+import org.junit.jupiter.api.Test;
+
+public class DNCSendBackServiceTest {
+ @Test
+ public void testParseZip(){
+
+ }
+}
--
Gitblit v1.9.3