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/program/service/NcProgramExportDNCService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 38d1fcb..72b3933 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,8 +50,6 @@
private final FlowProgramFileService flowProgramFileService;
private final HistoryService historyService;
private final TaskDispatchService taskDispatchService;
- private final MachineAnnotationConfig annotationConfig;
-
private final AnnotationProcessorHelper annotationProcessorHelper;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
@@ -90,8 +88,8 @@
/**
* 灏嗙▼搴忓寘鍜屼笅灞炴枃浠跺姞鍏ュ帇缂╁寘
- * @param zipOut
- * @param approved
+ * @param zipOut zip鏂囦欢杈撳嚭娴�
+ * @param approved 瀹℃壒瀹屾垚璁板綍
*/
private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());
@@ -103,6 +101,7 @@
Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+ //闇�瑕佸鍔犵増鏈彿鐨勮繃婊�
List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
@@ -125,7 +124,6 @@
InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
- //AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
AnnotationProcessor annoProcessor = this.annotationProcessorHelper.getProcessor(machine.getControlSystem());
AnnotationData annoData = new AnnotationData();
annoData.setSendPath(sendDir);
@@ -133,9 +131,12 @@
annoData.setDeviation(programPackageNode.getDeviation());
annoData.setFilename(programFile.getName());
- InputStream addedInsFinal = annoProcessor.putAnnotation(annoData,inputStream);
+ if(StringUtils.startsWith(programPackageNode.getParentIds(),"0,4")) {
+ //璇曞垏琛ュ厖,鐗规畩鏍囪鐘舵��
+ annoData.setProgramStatus(AnnotationUtil.TMP);
+ }
+ InputStream addedInsFinal = annoProcessor.putAnnotation(annoData, inputStream);
addedInsFinal.reset();
-
this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
--
Gitblit v1.9.3