From 79e81a02076cdd1e828eb06029cd51eb37522f42 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 09:11:37 +0800
Subject: [PATCH] 首页下载问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 171 +++++++++++++++++++++++++-------------------------------
1 files changed, 77 insertions(+), 94 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 01a348b..f9ce583 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,26 +2,29 @@
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.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.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.constants.FlowContants;
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.springframework.stereotype.Service;
@@ -40,26 +43,16 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
- //private final NcProgramService progService;
private final IDictClient dictClient;
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;
- public static final String ANNOTATION_DICT = "machine_annotation";
-
- /**
- * 鍒嗛〉鏌ヨ
- * @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鏁扮粍
@@ -74,6 +67,16 @@
approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
approvedService.updateById(approved);
+
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode.isDeviationProgram()){
+ //鍋忕鍗曠殑绋嬪簭锛屽鏋滃鎵瑰鍑鸿褰曟槸瑙ｉ攣褰㈡垚鐨勶紝杩樻槸闇�瑕侀攣瀹氾紱鏅�氳瘯鍒囪繃鐨勶紝涓嶉攣瀹�
+ HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
+ if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
+ }
}
}catch(Exception e){
@@ -88,109 +91,89 @@
* @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(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
- Machine machine = machineService.getByCode(packageNode.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";
}else if(programPackageNode.hasCured()){
status = "GH";
}
+ long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
+ }
- for (NcNode node : programNodes) {
- String filePathInZip = packageFolder + node.getName();
+ //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();
- InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getMachineGroupCode());
- this.addInputStreamToZip(zipOut, addedIns2, filePathInZip);
+
+ 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())) {
+ //鍋忕鍗曪紝澧炲姞鍋忕鍗曞彿
+ addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
+ }else{
+ addedInsFinal = addedIns2;
+ }*/
+ this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
}
-
/**
- * 鍔犲叆鏈哄簥涓嬪彂璺緞鍜岀▼搴忕姸鎬佺殑娉ㄩ噴
- * @param inputStream
- * @return
+ * 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
+ * @param packageFolder zip涓殑鏂囦欢澶�
+ * @param programNode 绋嬪簭鑺傜偣
+ * @param deviationSerial 鍋忕鍗曞簭鍙�
+ * @return zip涓殑鏂囦欢璺緞
*/
- /*
- InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
- //妫�娴嬬浜岃鏄惁鏄矾寰�
- String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
+ //涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
+ String filePathInZip;
- //TODO 鏀瑰垽鏂鍐呭
- return FileContentUtil.insertLine(inputStream,1,annotationText);
- }*/
+ if(deviationSerial != -1){
+ //鍔犲叆鍋忕鍗曞簭鍙�
+ String ext = FilenameUtils.getExtension(programNode.getName());
+ String dotExt = StringUtils.isNotBlank(ext)?"."+ext:ext;//甯︾偣鐨勬墿灞曞悕
- /**
- * 娣诲姞绋嬪簭涓撴敼鐨勬敞閲�
- * @param inputStream
- * @param status 绋嬪簭鐘舵��
- * @param machine
- * @param annotationList 閰嶇疆鐨勬敞閲婂瓧鍏稿垪琛�
- * @return
- * @throws IOException
- */
- /*
- InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
- String annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
-
- return FileContentUtil.insertLine(inputStream,2,annoText);
- }*/
-
- /**
- * 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
- * @param line
- * @param annotationList
- * @return
- */
- /*
- boolean isAnnotation(String line,List<Dict> annotationList){
- boolean isAnno = false;
-
- return isAnno;
- }*/
-
-
- /*
- String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
- R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
- String annotation = oriTest;
- String begin = "(";
- String end = ")";
-
- Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
- String annotationSetting = "(,)";
- if(dictOpt.isPresent()) {
- annotationSetting = dictOpt.get().getDictValue();
+ String temp = programNode.getName();
+ if(StringUtils.isNotBlank(ext)) {
+ temp = StringUtils.removeEnd(temp,dotExt);
+ }
+ filePathInZip = packageFolder + temp+"-P"+deviationSerial+dotExt;
+ }else{
+ //闈炲亸绂诲崟锛岀洿鎺ヤ娇鐢ㄥ師鏂囦欢鍚�
+ filePathInZip = packageFolder + programNode.getName();
}
- String[] arr = annotationSetting.split(",");
- if(arr.length == 2){
- begin = arr[0];
- end = arr[1];
- }
-
- annotation = begin + oriTest + end;
- return annotation;
-
+ return filePathInZip;
}
- */
-
/**
* 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
* @param zipOut zip杈撳嚭娴�
--
Gitblit v1.9.3