替换流程发起，增加文件校验

yangys

2025-08-18 4988082dcafba6a928aab186ae18a8da3e16795e

 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