From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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 366d803..38d1fcb 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
@@ -16,6 +16,7 @@
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
@@ -48,8 +49,10 @@
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
private final HistoryService historyService;
-
+ private final TaskDispatchService taskDispatchService;
private final MachineAnnotationConfig annotationConfig;
+
+ private final AnnotationProcessorHelper annotationProcessorHelper;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
* @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
@@ -100,7 +103,6 @@
Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
- //List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
@@ -113,10 +115,9 @@
}
long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
if(packageNodeHis.isDeviationProgram()) {
- deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
+ deviationSerial = taskDispatchService.getDeviationSerial(packageNodeHis.getProgramNo());
}
- //List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
for (NcNodeHis node : programNodes) {
String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -124,23 +125,17 @@
InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
- AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
+ //AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
+ AnnotationProcessor annoProcessor = this.annotationProcessorHelper.getProcessor(machine.getControlSystem());
AnnotationData annoData = new AnnotationData();
annoData.setSendPath(sendDir);
annoData.setProgramStatus(status);
annoData.setDeviation(programPackageNode.getDeviation());
annoData.setFilename(programFile.getName());
+
InputStream addedInsFinal = annoProcessor.putAnnotation(annoData,inputStream);
addedInsFinal.reset();
- /*
- InputStream addedInsFinal;
- InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getControlSystem());
- if(StringUtils.isNotBlank(programPackageNode.getDeviation())) {
- //鍋忕鍗曪紝澧炲姞鍋忕鍗曞彿
- addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
- }else{
- addedInsFinal = addedIns2;
- }*/
+
this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
@@ -151,7 +146,7 @@
* 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
* @param packageFolder zip涓殑鏂囦欢澶�
* @param programNode 绋嬪簭鑺傜偣
- * @param deviationSerial 鍋忕鍗曞簭鍙�
+ * @param deviationSerial 涓存椂鏇存敼鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
--
Gitblit v1.9.3