From d4ca3871c18474768c924fcbfd6e8d3178040092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 15 九月 2025 01:19:56 +0800
Subject: [PATCH] 性能优化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 63 ++++++++++++++++---------------
1 files changed, 32 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 8c25d7c..d696db6 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
@@ -2,28 +2,26 @@
package org.springblade.mdm.program.service;
import com.alibaba.csp.sentinel.util.StringUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
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.vo.DncSendBackData;
+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.system.feign.IDictClient;
import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
@@ -47,20 +45,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;
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
- */
- public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
- return this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
- }
-
+ private final MachineAnnotationConfig annotationConfig;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
* @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
@@ -89,19 +79,20 @@
* @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());
+ NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
String status = "SQ";
if(programPackageNode.isDeviationProgram()){
status = "PL";
@@ -109,25 +100,35 @@
status = "GH";
}
long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
- if(packageNode.isDeviationProgram()) {
- deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
}
- List<DictBiz> annotationDictList= programAnnotationService.getAnnotionList();
- 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.setAnnotation(annoData,inputStream);
+ addedInsFinal.reset();
+ /*
InputStream addedInsFinal;
- InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getMachineGroupCode());
+ InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getControlSystem());
if(StringUtils.isNotBlank(programPackageNode.getDeviation())) {
//鍋忕鍗曪紝澧炲姞鍋忕鍗曞彿
- addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getMachineGroupCode(), annotationDictList);;
+ addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
}else{
addedInsFinal = addedIns2;
- }
+ }*/
this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
@@ -141,7 +142,7 @@
* @param deviationSerial 鍋忕鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
- String genFilePathInZip(String packageFolder,NcNode programNode,long deviationSerial){
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
//涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
String filePathInZip;
--
Gitblit v1.9.3