From c723796f39021476247cf1adf8dc587939c95535 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 12:46:54 +0800
Subject: [PATCH] 机床增加导入接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 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 f07b78c..81f1daf 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
@@ -15,6 +15,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.ApproveRecordService;
@@ -25,6 +27,7 @@
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.stereotype.Service;
import java.io.*;
@@ -44,7 +47,8 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
- private final NcProgramService progService;
+ //private final NcProgramService progService;
+ private final MachineService machineService;
private final NcProgramApprovedService approvedService;
private final ApproveRecordService approveRecordService;
private final NcNodeService ncNodeService;
@@ -105,34 +109,29 @@
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);
- programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
-
- InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
- byte[] buffer = new byte[1024];
- int length;
- while ((length = inputStream.read(buffer)) >= 0) {
- zipOut.write(buffer, 0, length);
- }
- zipOut.closeEntry();
-
- */
-
- this.addInputStreamToZip(zipOut,inputStream,filePathInZip);
+ Machine machine = machineService.getByCode(node.getMachineCode());
+ InputStream addedIns = addSendPath(inputStream,machine.getProgSendDir());
+ this.addInputStreamToZip(zipOut,addedIns,filePathInZip);
}
}
/**
+ * 鍔犲叆鏈哄簥涓嬪彂璺緞
+ * @param inputStream
+ * @return
+ */
+ InputStream addSendPath(InputStream inputStream,String machineSendPath) throws IOException {
+ return FileContentUtil.insertLine(inputStream,1,machineSendPath);
+
+ }
+ /**
* 瀵煎叆鏁版嵁鏂囦欢
* @param zipOut
*/
--
Gitblit v1.9.3