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 | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 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 2b10063..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
@@ -16,15 +16,13 @@
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;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.service.programannotation.AnnotationData;
-import org.springblade.mdm.program.service.programannotation.AnnotationProcessor;
-import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
-import org.springblade.mdm.program.service.programannotation.ProcessorHelper;
+import org.springblade.mdm.program.service.programannotation.*;
import org.springblade.system.feign.IDictClient;
import org.springframework.stereotype.Service;
@@ -51,8 +49,8 @@
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
private final HistoryService historyService;
-
- private final MachineAnnotationConfig annotationConfig;
+ private final TaskDispatchService taskDispatchService;
+ private final AnnotationProcessorHelper annotationProcessorHelper;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
* @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
@@ -68,13 +66,16 @@
approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
approvedService.updateById(approved);
- NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
- if(pkgNode.isDeviationProgram()){
+ NcNodeHis pkgNodeHis = this.ncNodeHisService.getById(approved.getNcNodeId());
+ if(pkgNodeHis.isDeviationProgram()){
//鍋忕鍗曠殑绋嬪簭锛屽鏋滃鎵瑰鍑鸿褰曟槸瑙ｉ攣褰㈡垚鐨勶紝杩樻槸闇�瑕侀攣瀹氾紱鏅�氳瘯鍒囪繃鐨勶紝涓嶉攣瀹�
HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
- pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
- ncNodeService.updateById(pkgNode);
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode != null) {
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
}
}
}
@@ -87,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());
@@ -100,23 +101,22 @@
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;
NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
- String status = "SQ";
+ String status = AnnotationUtil.SQ;
if(programPackageNode.isDeviationProgram()){
- status = "PL";
+ status = AnnotationUtil.LG;
}else if(programPackageNode.hasCured()){
- status = "GH";
+ status = AnnotationUtil.GH;
}
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 +124,19 @@
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);
annoData.setProgramStatus(status);
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();
- /*
- 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 +147,7 @@
* 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
* @param packageFolder zip涓殑鏂囦欢澶�
* @param programNode 绋嬪簭鑺傜偣
- * @param deviationSerial 鍋忕鍗曞簭鍙�
+ * @param deviationSerial 涓存椂鏇存敼鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
@@ -179,7 +175,7 @@
* @param zipOut zip杈撳嚭娴�
* @param inputStream 杈撳叆娴�
* @param entryName 鏂囦欢鍚�
- * @throws IOException
+ * @throws IOException 鍐欐枃浠跺紓甯�
*/
void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
throws IOException {
--
Gitblit v1.9.3