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/vo/NcProgramExportDncPageVO.java | 7 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 1
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java | 50 +++++++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java | 6 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 26 +++++++------
6 files changed, 75 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java
index 086e661..2135394 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java
@@ -51,10 +51,10 @@
return R.fail(e.getMessage());
}
}
-
+ /*
@PostMapping("accept")
@ApiOperationSupport(order = 2)
- @Operation(summary = "MDM绋嬪簭鍏ュ簱鍏ュ簱", description = "娑夊瘑缃戠▼搴忕‘璁ゅ叆搴�")
+ @Operation(summary = "MDM绋嬪簭鍏ュ簱", description = "娑夊瘑缃戠▼搴忕‘璁ゅ叆搴�")
public R<Void> accept(@RequestParam String ids) {
try {
mdmProgramImportService.mdmFileAccept(ids);
@@ -63,5 +63,5 @@
return R.fail(e.getMessage());
}
return R.success();
- }
+ }*/
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
index 18d4c99..c74b4e0 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
@@ -11,7 +11,7 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="exportDncPageQuery" resultType="org.springblade.mdm.program.vo.NcProgramExportDncPageVO">
- select a.id,a.nc_program_id,p.name,p.nc_node_id,a.create_time,p.process_name from mdm_nc_program_approved a inner join mdm_nc_program p on a.nc_program_id=p.id
+ select a.id,a.nc_program_id,p.name,p.nc_node_id,p.part_no,p.part_no_edition,p.process_name,a.create_time from mdm_nc_program_approved a inner join mdm_nc_program p on a.nc_program_id=p.id
where a.is_deleted=0
<where>
<if test="query.name!=null and query.name!=''">
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();
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 69849a5..417c32e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -127,6 +127,7 @@
recObj.put("name",program.getName());
recObj.put("partNo",program.getPartNo());
recObj.put("ncNodeId",program.getNcNodeId());
+ recObj.put("bindNcNodeId",program.getBindNcNodeId());
recObj.put("url",program.getUrl());
recObj.put("isCured",program.getIsCured());
recObj.put("isLocked",program.getIsLocked());
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
index 3af41ed..74ede51 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
@@ -21,6 +21,56 @@
private String code;
@Schema(description = "绋嬪簭鍚嶇О")
private String name;
+ private long ncNodeId;
+
+ @Schema(description = "鍚屽悕缁戝畾鑺傜偣id")
+ private Long bindNcNodeId;
+
+ @Schema(description = "鏂囦欢鍦板潃")
+ private String url;
+
+ @Schema(description = "鏂囦欢绫诲瀷")
+ private String category;
+
+ @Schema(description = "鏄惁涓烘枃鏈被鍨�")
+ private Boolean isTextFile;
+
+ /**
+ * 宸ュ簭锛屽鈥滅簿閾ｂ��
+ */
+ //private String processName;
+ /**
+ * 澶囨敞
+ */
+ //private String remark;
+
+ @Schema(description = "璁惧锛堟満搴婏級缂栫爜")
+ private String machineCode;
+
+ @Schema(description = "鍥惧彿")
+ private String partNo;
+
+ /**
+ * 鎻忚堪
+ */
+ @Schema(description = "鎻忚堪")
+ private String description;
+
+ @Schema(description = "鏄惁鍥哄寲")
+ private Integer isCured;
+
+
+ @Schema(description = "宸ュ簭鐗堟")
+ private String processEdition;
+
+ @Schema(description = "鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟")
+ private Integer isLastEdition = 1;
+
+ @Schema(description = "鏄惁閿佸畾")
+ private Integer isLocked = 0;
+
+ @Schema(description = "鏄惁娴嬭瘯绋嬪簭")
+ private Integer isTest = 0;
private String md5;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
index 1b2b28d..19e1c26 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
@@ -13,5 +13,10 @@
public class NcProgramExportDncPageVO extends BaseVO {
@Schema(description = "绋嬪簭鍚嶇О")
private String name;
-
+ @Schema(description = "鍥惧彿")
+ private String partNo;
+ @Schema(description = "鍥惧彿鐗堟")
+ private String partNoEdition;
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String processName;
}
--
Gitblit v1.9.3