From 79e81a02076cdd1e828eb06029cd51eb37522f42 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 09:11:37 +0800
Subject: [PATCH] 首页下载问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java
index e59e601..2b28b62 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java
@@ -4,16 +4,25 @@
import jakarta.servlet.ServletOutputStream;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.machinefile.entity.MachineAcceptedFile;
+import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
+import org.springblade.mdm.program.service.ProgramAnnotationService;
+import org.springblade.mdm.program.service.programannotation.*;
+import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.mdm.utils.ProgramFileNameParser;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
@@ -32,8 +41,10 @@
public class NcProgramExportInnerService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
private final MachineAcceptedFileService machineAcceptedService;
private final OssTemplate ossTemplate;
-
-
+ private final MachineFileService machineFileService;
+ private final MachineService machineService;
+ private final MachineAnnotationConfig annoConfig;
+ private final ProgramAnnotationService programAnnotationService;
/**
* 瀵煎嚭鍒版秹瀵嗙綉
* @param acceptedFileIds
@@ -49,13 +60,13 @@
Map<String,List<MachineAcceptedFile>> map = acceptedFiles.stream()
.collect(Collectors.groupingBy(s -> ProgramFileNameParser.parseProgramName(s.getName()).logicProgramName()));
- List<MachineAcceptedFile> exportedFiles = new ArrayList<>();
for (Map.Entry<String, List<MachineAcceptedFile>> entry : map.entrySet()) {
String programName = entry.getKey();
List<MachineAcceptedFile> acceptedFileList = entry.getValue();
for (MachineAcceptedFile acceptedFile : acceptedFileList) {
try(InputStream ins = ossTemplate.statFileStream(acceptedFile.getOssName()) ) {
- addInputStreamToZip(zipOut,ins , programName + "/" + acceptedFile.getName());
+ MachineFile machineFile = machineFileService.getById(acceptedFile.getMachineFileId());
+ addInputStreamToZip(zipOut,ins , programName + "/" + acceptedFile.getName(),acceptedFile.getName(),machineFile.getMachineCode());
}
acceptedFile.setExportTime(DateUtil.now());
}
@@ -69,21 +80,42 @@
}
- public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName,String filename,String machineCode)
throws IOException {
// 鍒涘缓鏂扮殑 ZIP 鏉＄洰
ZipEntry zipEntry = new ZipEntry(entryName);
zipOut.putNextEntry(zipEntry);
-
+ InputStream insAdded = setAnnotations(inputStream,filename,machineCode);
// 灏嗚緭鍏ユ祦鍐欏叆 ZIP 杈撳嚭娴�
byte[] buffer = new byte[1024];
int length;
- while ((length = inputStream.read(buffer)) >= 0) {
+ while ((length = insAdded.read(buffer)) >= 0) {
zipOut.write(buffer, 0, length);
}
// 鍏抽棴褰撳墠鏉＄洰
zipOut.closeEntry();
}
+
+ InputStream setAnnotations(InputStream inputStream,String filename,String machineCode) throws IOException {
+ Machine machine = this.machineService.getByCode(machineCode);
+ AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annoConfig);
+
+ AnnotationData annoData = new AnnotationData();
+ annoData.setFilename(filename);
+ annoData.setSendPath(machine.getProgSendDir());
+
+ AnnotationProperties annoProps = annoProcessor.getAnnotationProperties();
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
+ String statusLine = FileContentUtil.readLineAt(bais,annoProps.getStatusLineIndex());
+ String status = programAnnotationService.removeAnnotation(machine.getControlSystem(),statusLine);
+ if(StringUtils.equalsAny(status,"SQ","GH","PL")){
+
+ }
+ bais.reset();
+ annoData.setProgramStatus("3");
+ return annoProcessor.putAnnotation(annoData,bais);
+ }
}
--
Gitblit v1.9.3