庆安mdm
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yangys
2025-09-06 a5f944c2bc0107e5df936937f1c33e5e03eb8fed 
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java


@@ -15,18 +15,22 @@


import org.springblade.core.tool.utils.DateUtil;


import org.springblade.core.tool.utils.FileUtil;


import org.springblade.core.tool.utils.Func;


import org.springblade.mdm.basesetting.machine.entity.Machine;


import org.springblade.mdm.basesetting.machine.service.MachineService;


import org.springblade.mdm.commons.service.ParamService;


import org.springblade.mdm.flow.entity.FlowProgramFile;


import org.springblade.mdm.flow.service.CureFlowService;


import org.springblade.mdm.flow.service.FlowCommonService;


import org.springblade.mdm.flow.service.FlowProgramFileService;


import org.springblade.mdm.program.entity.DncBackFile;


import org.springblade.mdm.program.entity.NcNode;


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.vo.DncSendBackFile;


import org.springblade.mdm.program.vo.ProgramAnnotation;


import org.springblade.mdm.utils.FileContentUtil;


import org.springblade.mdm.utils.ZipTextFileContentUtil;


import org.springblade.system.pojo.entity.DictBiz;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.multipart.MultipartFile;


@@ -50,14 +54,14 @@


@AllArgsConstructor


public class DNCSendBackService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {


   private final CureFlowService cureFlowService;


   private final FlowProgramFileService flowProgramFileService;


   private final ProgramAnnotationService programAnnotationService;


   private final NcNodeService ncNodeService;


   private final OssTemplate ossTemplate;


   private final BladeRedis bladeRedis;


   private final FlowCommonService flowCommonService;


   private final DncBackFileService dncBackFileService;


   private final ProgramFlowStatusQueryService programFlowStatusQueryService;




   private final MachineService machineService;


   private final ParamService paramService;


   /**


    * 偏离单文件末尾的模式：P+数字


    */


@@ -123,6 +127,7 @@


            }


         }




         List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();


         NcNode programPackageNode;


         //目录列表，即程序包列表


         for(String entryName : dirEntryNameList){


@@ -137,7 +142,7 @@


            }




            progData.setProgramName(packageName);


            String statusLine = "";


            String statusLine;


            Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();


            if(optFilename.isPresent()){


               entry = zipFile.getEntry(optFilename.get());


@@ -154,8 +159,19 @@


                  //偏离


                  programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);


               }else{


                  throw new ServiceException("未找到程序文件中的状态注释");


                  //查询是否车床，是车床可以放过，按试切处理


                  programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);


                  if(programPackageNode!=null){


                     Machine machine = machineService.getByCode(programPackageNode.getMachineCode());


                     String chechuangVal = paramService.turninngValue();


                     if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){


                        //车床


                        ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);


                        statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);


                     }


                  }


               }




               if(programPackageNode != null) {


                  progData.setId(programPackageNode.getId());


                  progData.setProgramNo(programPackageNode.getProgramNo());


@@ -172,10 +188,10 @@


                  progData.setFiles(programFiles);


                  list.add(progData);


               }else{


                  throw new ServiceException("找不到程序包名:"+packageName+statusLine);


                  throw new ServiceException("找不到程序包名:"+packageName);


               }


            }else{


               throw new ServiceException(entryName+"包下未找到文件"+statusLine);


               throw new ServiceException(entryName+"包下未找到文件");


            }




         }


@@ -251,7 +267,6 @@


         //根据内部文件，读取和分析程序包和程序文件数据


         List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();


         for(String dir : dirList){


            //String programPackageName1 = StringUtils.removeEnd(dir,"/");


            String folderName = StringUtils.removeEnd(dir,"/");




            PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);


@@ -358,7 +373,7 @@


      String result  = "";


      String zipFileName = bladeRedis.get(getFileKey());


      return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(zipFileName),entryName);


		




      /*


      try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){


         Path tempZipFile = createTempFile(inputStream);