From fe5370f0b107736fd41de699612f021969bc954f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 02:10:10 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 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 cfec60a..463a443 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
@@ -6,19 +6,23 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.oss.OssTemplate;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+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.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.*;
import org.springblade.system.feign.IDictClient;
-import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
import java.io.*;
@@ -40,11 +44,12 @@
private final MachineService machineService;
private final NcProgramApprovedService approvedService;
private final NcNodeService ncNodeService;
+ private final NcNodeHisService ncNodeHisService;
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
- private final ProgramAnnotationService programAnnotationService;
+ private final HistoryService historyService;
-
+ private final MachineAnnotationConfig annotationConfig;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
* @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
@@ -59,6 +64,19 @@
approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
approvedService.updateById(approved);
+
+ 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)){
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode != null) {
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
+ }
+ }
}
}catch(Exception e){
@@ -73,37 +91,49 @@
* @param approved
*/
private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
- NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());
+ NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());
- String packageFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
+ String packageFolder = packageNodeHis.getName()+"/";
ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
- Machine machine = machineService.getByCode(packageNode.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+ Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
- List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
+ //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;
- NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
- String status = "SQ";
+ NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
+ 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(packageNode.isDeviationProgram()) {
- deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
}
- List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
- for (NcNode node : programNodes) {
+ //List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
+ for (NcNodeHis node : programNodes) {
String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
+
+ AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
+ 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())) {
@@ -111,7 +141,7 @@
addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
}else{
addedInsFinal = addedIns2;
- }
+ }*/
this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
@@ -125,7 +155,7 @@
* @param deviationSerial 鍋忕鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
- String genFilePathInZip(String packageFolder,NcNode programNode,long deviationSerial){
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
//涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
String filePathInZip;
@@ -150,7 +180,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