From 95b1f7b2b35872444acf8e85cc236682d0c4e47e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 11:08:06 +0800
Subject: [PATCH] 分工表加入重复图号的校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
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 91342ea..f07b78c 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
@@ -50,18 +50,10 @@
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
- public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
+ //public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
- /**
- * 鏄惁鍘嬬缉鍖呭唴鐨勬暟鎹枃浠�
- * @param filename 鏂囦欢鍚嶇О
- * @return
- */
- public static boolean isDataFile(String filename){
- return StringUtils.equals(filename, PROGRAM_JSON_FILE) || StringUtils.equals(filename, NODE_JSON_FILE) || StringUtils.equals(filename, APPROVE_RECORD_JSON_FILE);
- }
/**
* 鍒嗛〉鏌ヨ
* @param query 鏌ヨ鍙傛暟
@@ -88,14 +80,8 @@
for (Long approvedId : approvedIdArr) {
NcProgramApproved approved = approvedService.getById(approvedId);
- programPackageNodeIdList.add(approved.getNodeId());
+ programPackageNodeIdList.add(approved.getNcNodeId());
- /*
- String filename = prog.getOssName();
- InputStream inputStream = ossTemplate.statFileStream(filename);
-
- addInputStreamToZip(zipOut, inputStream, prog.getName());
- */
addProgramPackageToZip(zipOut,approved);
}
addDataJson(zipOut, programPackageNodeIdList);
@@ -116,11 +102,16 @@
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
- List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNodeId()).list();
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
+ programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
+
+ InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
+
+ /*
ZipEntry fileEntry = new ZipEntry(filePathInZip);
zipOut.putNextEntry(fileEntry);
@@ -133,6 +124,10 @@
zipOut.write(buffer, 0, length);
}
zipOut.closeEntry();
+
+ */
+
+ this.addInputStreamToZip(zipOut,inputStream,filePathInZip);
}
}
@@ -142,7 +137,6 @@
* @param zipOut
*/
void addDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
- //addProgramDataJson(zipOut, programPackageNodeIdList);
addNodeDataJson(zipOut, programPackageNodeIdList);
addApproveRecordDataJson(zipOut, programPackageNodeIdList);
}
@@ -163,7 +157,7 @@
allNodeIds.add(node.getId());
}
//鍔犲叆绋嬪簭鍖呬笅绾х殑绋嬪簭鑺傜偣
- List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId)).list();
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId).toList()).list();
allNodeIds.addAll(programNodes.stream().map(NcNode::getId).toList());
List<Long> distinctIds = allNodeIds.stream().distinct().toList();
@@ -175,7 +169,7 @@
addSuperProperties(recObj,node);
jsonArray.add(recObj);
}
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),PROGRAM_JSON_FILE);
+ addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),NODE_JSON_FILE);
}
@@ -199,6 +193,7 @@
recObj.put("machineCode", node.getMachineCode());
recObj.put("flowProgramFileId", node.getFlowProgramFileId());
+ recObj.put("processInstanceId", node.getProcessInstanceId());
return recObj;
}
@@ -208,10 +203,12 @@
* @param programPackageNodeIdList 绋嬪簭鍖呭悕鐨刬d鍒楄〃
*/
void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
- List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getProcessInstanceId, programPackageNodeIdList)
+ /*
+ List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getId, programPackageNodeIdList)
.list().stream().map(NcNode::getProcessInstanceId).toList();
-
- List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
+*/
+ //List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
+ List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getNcNodeId, programPackageNodeIdList).list();
JSONArray jsonArray = new JSONArray();
for(ApproveRecord record : records){
@@ -223,9 +220,8 @@
recObj.put("operateTime",record.getOperateTime());
recObj.put("operateResult",record.getOperateResult());
recObj.put("taskName",record.getTaskName());
- recObj.put("ncProgramId",record.getNcProgramId());
recObj.put("processInstanceId",record.getProcessInstanceId());
-
+ recObj.put("ncNodeId",record.getNcNodeId());
addSuperProperties(recObj,record);
jsonArray.add(recObj);
@@ -244,7 +240,14 @@
recObj.put("createDept",entity.getCreateDept());
}
- public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ /**
+ * 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
+ * @param zipOut zip杈撳嚭娴�
+ * @param inputStream 杈撳叆娴�
+ * @param entryName 鏂囦欢鍚�
+ * @throws IOException
+ */
+ void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
throws IOException {
// 鍒涘缓鏂扮殑 ZIP 鏉＄洰
ZipEntry zipEntry = new ZipEntry(entryName);
--
Gitblit v1.9.3