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 | 186 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 166 insertions(+), 20 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 88f5aa2..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
@@ -1,27 +1,35 @@
package org.springblade.mdm.program.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.alibaba.csp.sentinel.util.StringUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
+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.tool.utils.FileUtil;
+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.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.vo.DncSendBackData;
+import org.springblade.mdm.program.service.programannotation.*;
+import org.springblade.system.feign.IDictClient;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
+import java.io.*;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* 涓嬪彂/鍥炰紶绋嬪簭缁熻
@@ -33,18 +41,156 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
+ 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 HistoryService historyService;
+ private final TaskDispatchService taskDispatchService;
+ private final MachineAnnotationConfig annotationConfig;
+
+ private final AnnotationProcessorHelper annotationProcessorHelper;
+ /**
+ * 瀵煎嚭dnc鍘嬬缉鍖�
+ * @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
+ */
+ public void exportDnc(Long[] approvedIdArray, OutputStream os) throws IOException {
+ //FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
+ try (ZipOutputStream zipOut = new ZipOutputStream(os);os) {//os
+
+ for (Long approvedId : approvedIdArray) {
+ NcProgramApproved approved = approvedService.getById(approvedId);
+ addProgramPackageToZip(zipOut,approved);
+
+ 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){
+ Throwable [] err = e.getSuppressed();
+ throw new ServiceException("瀵煎嚭宸ユ帶缃戦敊璇�"+e.getMessage());
+ }
+ }
/**
- * 鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
+ * 灏嗙▼搴忓寘鍜屼笅灞炴枃浠跺姞鍏ュ帇缂╁寘
+ * @param zipOut
+ * @param approved
*/
- public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
+ private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
+ NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());
- IPage<DncSendBackData> page = this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
+ String packageFolder = packageNodeHis.getName()+"/";
+ ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
+ zipOut.putNextEntry(zipEntry);
+ zipOut.closeEntry();
- return page;
+ Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+ List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
+
+ FlowProgramFile programFile;
+ NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
+ String status = AnnotationUtil.SQ;
+ if(programPackageNode.isDeviationProgram()){
+ status = AnnotationUtil.LG;
+ }else if(programPackageNode.hasCured()){
+ status = AnnotationUtil.GH;
+ }
+ long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = taskDispatchService.getDeviationSerial(packageNodeHis.getProgramNo());
+ }
+
+ 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);
+ 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();
+
+ this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
+ }
+ }
+
+ }
+
+ /**
+ * 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
+ * @param packageFolder zip涓殑鏂囦欢澶�
+ * @param programNode 绋嬪簭鑺傜偣
+ * @param deviationSerial 涓存椂鏇存敼鍗曞簭鍙�
+ * @return zip涓殑鏂囦欢璺緞
+ */
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
+ //涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
+ String filePathInZip;
+
+ if(deviationSerial != -1){
+ //鍔犲叆鍋忕鍗曞簭鍙�
+ String ext = FilenameUtils.getExtension(programNode.getName());
+ String dotExt = StringUtils.isNotBlank(ext)?"."+ext:ext;//甯︾偣鐨勬墿灞曞悕
+
+ String temp = programNode.getName();
+ if(StringUtils.isNotBlank(ext)) {
+ temp = StringUtils.removeEnd(temp,dotExt);
+ }
+ filePathInZip = packageFolder + temp+"-P"+deviationSerial+dotExt;
+ }else{
+ //闈炲亸绂诲崟锛岀洿鎺ヤ娇鐢ㄥ師鏂囦欢鍚�
+ filePathInZip = packageFolder + programNode.getName();
+ }
+ return filePathInZip;
+ }
+ /**
+ * 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
+ * @param zipOut zip杈撳嚭娴�
+ * @param inputStream 杈撳叆娴�
+ * @param entryName 鏂囦欢鍚�
+ * @throws IOException 鍐欐枃浠跺紓甯�
+ */
+ void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ throws IOException {
+ // 鍒涘缓鏂扮殑 ZIP 鏉＄洰
+ ZipEntry zipEntry = new ZipEntry(entryName);
+ zipOut.putNextEntry(zipEntry);
+
+ // 灏嗚緭鍏ユ祦鍐欏叆 ZIP 杈撳嚭娴�
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = inputStream.read(buffer)) >= 0) {
+ zipOut.write(buffer, 0, length);
+ }
+
+ // 鍏抽棴褰撳墠鏉＄洰
+ zipOut.closeEntry();
}
}
--
Gitblit v1.9.3