From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/NcProgramExportInnerService.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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 26e4aac..a23a423 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
@@ -5,14 +5,12 @@
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.core.tool.utils.SpringUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
-import org.springblade.mdm.flow.excution.events.CureFinishedEvent;
import org.springblade.mdm.gkw.task.entity.MachineBackTask;
import org.springblade.mdm.gkw.task.service.MachineBackTaskService;
import org.springblade.mdm.machinefile.entity.MachineAcceptedFile;
@@ -54,9 +52,9 @@
private final MachineBackTaskService machineBackTaskService;
/**
* 瀵煎嚭鍒版秹瀵嗙綉
- * @param acceptedFileIds
- * @param os
- * @throws IOException
+ * @param acceptedFileIds 鎺ュ彈鐨勬枃浠秈d绂讳簡鍚�
+ * @param os 杈撳嚭娴�
+ * @throws IOException 鎿嶄綔zip鍙兘瀵艰嚧鐨処O寮傚父
*/
@Transactional
public void exportToInner(List<Long> acceptedFileIds, ServletOutputStream os) throws IOException {
@@ -65,6 +63,8 @@
try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os
Map<String,List<MachineAcceptedFile>> map = acceptedFiles.stream()
.collect(Collectors.groupingBy(s -> ProgramFileNameParser.parseProgramName(s.getName()).logicProgramName()));
+
+ this.createFoldersInZip(zipOut,map.keySet());
for (Map.Entry<String, List<MachineAcceptedFile>> entry : map.entrySet()) {
String programName = entry.getKey();
@@ -77,7 +77,6 @@
acceptedFile.setExportTime(DateUtil.now());
acceptedFile.setStatus(MachineAcceptedFile.STATUS_EXPORTED);
}
-
}
machineAcceptedService.updateBatchById(acceptedFiles);
@@ -94,18 +93,39 @@
}
+ /**
+ * 鍒涘缓宸﹀彸鐨勭▼搴忓寘鍚嶆枃浠跺す
+ * @param zipOut zip杈撳嚭娴�
+ * @param folderSet 绋嬪簭鎶ュ悕鏂囦欢澶归泦鍚�
+ * @throws IOException zipIO鎿嶄綔寮傚父
+ */
+ void createFoldersInZip(ZipOutputStream zipOut,Set<String> folderSet) throws IOException {
+ for(String folderName : folderSet){
+ ZipEntry zipEntry = new ZipEntry(folderName+"/");// "/"缁撳熬琛ㄧず鏂囦欢澶�
+ zipOut.putNextEntry(zipEntry);
+ zipOut.closeEntry();
+ }
+
+
+ }
+
+
void finishTask(List<Long> backTaskIdList){
if(backTaskIdList.isEmpty()){
return;
}
- List<MachineBackTask> tasks = machineBackTaskService.lambdaQuery().in(MachineBackTask::getId,backTaskIdList).list();
- for(MachineBackTask backTask : tasks){
- backTask.setStatus(MachineBackTask.STATUS_FINISHED);
- backTask.setFinishTime(new Date());
+ for(Long backTaskId : backTaskIdList){
+ MachineBackTask backTask = machineBackTaskService.getById(backTaskId);
+ List<MachineAcceptedFile> acceptedFiles = machineAcceptedService.listByBackTaskId(backTaskId);
- machineBackTaskService.updateById(backTask);
+ if(acceptedFiles.size() == backTask.getSegCount()) {
+ backTask.setStatus(MachineBackTask.STATUS_FINISHED);
+ backTask.setFinishTime(new Date());
+
+ machineBackTaskService.updateById(backTask);
+ }
+
}
-
}
/**
--
Gitblit v1.9.3