延时问题

yangys

2025-09-17 3907579a69079b5ee462d17799e3995d9cd77fd4

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java

@@ -2,27 +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.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
@@ -46,21 +48,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;
   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数组
@@ -75,6 +68,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){
@@ -89,116 +92,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(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";
      }else if(programPackageNode.hasCured()){
         status = "GH";
      }
      long deviationSerial = -1;//偏离单序号 ，-1为非偏离单，不需要加入
      if(packageNodeHis.isDeviationProgram()) {
         deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
      }

      List<DictBiz> annotationDictList= programAnnotationService.getAnnotionList();
      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();

            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);
         }
      }

   }


   /**
    * 加入机床下发路径和程序状态的注释
    * @param inputStream
    * @return
    * 生成在zip中的文件路径
    * @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输出流