From 4988082dcafba6a928aab186ae18a8da3e16795e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 12:00:55 +0800
Subject: [PATCH] 替换流程发起，增加文件校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 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 3617173..f91092c 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
@@ -8,6 +8,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -33,10 +34,7 @@
import java.io.*;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -80,24 +78,24 @@
*/
public void exportDnc(Long[] approvedIdArray, OutputStream os) throws IOException {
//FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
- try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os
-
- //ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();
+ try (ZipOutputStream zipOut = new ZipOutputStream(os);os) {//os
for (Long approvedId : approvedIdArray) {
NcProgramApproved approved = approvedService.getById(approvedId);
- //programPackageNodeIdList.add(approved.getNcNodeId());
-
addProgramPackageToZip(zipOut,approved);
+
+ approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
+ approvedService.updateById(approved);
}
//鐘舵�佷慨鏀逛负宸插鍑�
- approvedService.lambdaUpdate().in(NcProgramApproved::getId, approvedIdArray)
- .set(NcProgramApproved::getStatus,NcProgramApproved.STATUS_EXPORTED).update();
- //addDataJson(zipOut, programPackageNodeIdList);
+ /*
+ approvedService.lambdaUpdate().in(NcProgramApproved::getId, Arrays.asList(approvedIdArray))
+ .set(NcProgramApproved::getStatus,NcProgramApproved.STATUS_EXPORTED).update();*/
+ }catch(Exception e){
+ Throwable [] err = e.getSuppressed();
+ throw new ServiceException("瀵煎嚭宸ユ帶缃戦敊璇�"+e.getMessage());
}
-
- os.close();
}
@@ -111,6 +109,9 @@
ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
+
+ NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());
+ Machine machine = machineService.getByCode(packageNode.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
@@ -126,31 +127,17 @@
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
-
- InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
- Machine machine = machineService.getByCode(node.getMachineCode());
- InputStream addedIns1 = addSendDirAnnotation(inputStream,machine,annotationList);
- InputStream addedIns2 = addProgramStatusAnnotation(addedIns1,status,machine,annotationList);
- this.addInputStreamToZip(zipOut,addedIns2,filePathInZip);
+ if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
+ InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
+ InputStream addedIns1 = addSendDirAnnotation(inputStream, machine, annotationList);
+ InputStream addedIns2 = addProgramStatusAnnotation(addedIns1, status, machine, annotationList);
+ this.addInputStreamToZip(zipOut, addedIns2, filePathInZip);
+ }
}
}
- /**
- * 鑾峰彇瀛楀吀涓厤缃殑娉ㄩ噴
- * @return 瀛楀吀椤瑰垪琛�
- */
- List<Dict> getAnnotionList(){
- List<Dict> annotationList;
- R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
- if(dictsResult.isSuccess()) {
- annotationList = dictsResult.getData();
- }else{
- annotationList = Collections.emptyList();
- }
- return annotationList;
- }
/**
* 鍔犲叆鏈哄簥涓嬪彂璺緞鍜岀▼搴忕姸鎬佺殑娉ㄩ噴
* @param inputStream
--
Gitblit v1.9.3