From 4301ffcfa7d715d7341cb77ba29dee24366fb2a3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 07 七月 2025 22:24:02 +0800
Subject: [PATCH] dnc导出补充字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index ec40485..3133dde 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -54,7 +54,7 @@
InputStream zipFileInputStream = file.getInputStream();//test
byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
- list = parseDncZipFromByteArray(bytes);
+ list = parseMdmZipFromByteArray(bytes);
} catch (IOException e) {
@@ -89,10 +89,8 @@
System.out.println("鍒涘缓鐨勪复鏃舵枃浠�: " + tempFile);
return tempFile.toFile();
}
- public static List<MdmProgramImportVO> parseDncZipFromByteArray(byte[] zipData) throws IOException {
+ public static List<MdmProgramImportVO> parseMdmZipFromByteArray(byte[] zipData) throws IOException {
List<MdmProgramImportVO> list = new ArrayList<>();
- //List<DncSendBackData> datas = ZipFileDirectoryScanner.getFilesInDirectoryRecursive(zipData, "");
-
Map<String,String> fileMd5Map = new HashMap<>();
Map<String,MdmProgramImportVO> fileDataMap = new HashMap<>();
try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(zipData);
@@ -101,9 +99,8 @@
ZipArchiveEntry entry;
Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
while (entries.hasMoreElements()) {
- //while ((entry = zis.getNextZipEntry()) != null) {
entry = entries.nextElement();
- DncSendBackData prog = new DncSendBackData();
+
String entryName = entry.getName();
if (!entry.isDirectory()) {
@@ -120,9 +117,19 @@
d.setName(jsonObject.getString("name"));
d.setId(jsonObject.getLong("id"));
d.setCode(jsonObject.getString("code"));
- //d.setFileBackTime(LocalDateTime.now());//鍒拌揪鏃堕棿
+ d.setDescription(jsonObject.getString("description"));
+ d.setCategory(jsonObject.getString("category"));
+ d.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
+ d.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
+ d.setIsLocked(jsonObject.getInteger("isLocked"));
+ d.setIsTest(jsonObject.getInteger("isTest"));
+ d.setMachineCode(jsonObject.getString("machineCode"));
+ d.setNcNodeId(jsonObject.getLong("ncNodeId"));
+ d.setPartNo(jsonObject.getString("partNo"));
+ d.setProcessEdition(jsonObject.getString("processEdition"));
fileDataMap.put(d.getName(),d);
+
list.add(d);
}
@@ -133,11 +140,6 @@
}
}
- System.out.println("鏂囦欢鍚�: " + entry.getName());
- System.out.println("澶у皬: " + entry.getSize());
-
- // 璇诲彇鏂囦欢鍐呭鍒板瓧鑺傛暟缁�
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
}
--
Gitblit v1.9.3