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


@@ -5,6 +5,7 @@


import lombok.Data;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.FilenameUtils;


import org.apache.commons.io.IOUtils;


import org.apache.commons.lang3.StringUtils;


import org.springblade.core.log.exception.ServiceException;


import org.springblade.core.mp.base.BizServiceImpl;


@@ -15,28 +16,35 @@


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.service.programannotation.*;


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;




import java.io.*;


import java.lang.annotation.Annotation;


import java.nio.file.Files;


import java.nio.file.Path;


import java.nio.file.StandardOpenOption;


import java.time.Duration;


import java.util.*;


import java.util.regex.Pattern;


import java.util.zip.ZipEntry;


import java.util.zip.ZipFile;




@@ -50,13 +58,15 @@


@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;


   private final MachineAnnotationConfig machineAnnotationConfig;




   /**


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


@@ -123,39 +133,67 @@


            }


         }




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


         NcNode programPackageNode;


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


         for(String entryName : dirEntryNameList){


            DncSendBackData progData = new DncSendBackData();


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




            PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);


            String packageName = pkgAndEdition.getProgramPackageName();


            String processEdition = pkgAndEdition.getProcessEdition();


            //PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);


            String packageName = folderName;//pkgAndEdition.getProgramPackageName();


            //String processEdition = pkgAndEdition.getProcessEdition();


            /*


            if(StringUtils.isBlank(packageName) || StringUtils.isBlank(processEdition)){


               throw new ServiceException("包内文件夹名格式错误应该为[零组件号-工序号-工序版次]:"+folderName);


            }


               throw new ServiceException("包内文件夹名格式错误，应该为[零组件号-工序号-工序版次]:"+folderName);


            }*/




            progData.setProgramName(packageName);


            String statusLine = "";


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


            if(optFilename.isPresent()){


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


               InputStream ins = zipFile.getInputStream(entry);


               ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(ins));;


               progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));


               statusLine = FileContentUtil.readLineAt(ins,2);




               AnnotationProperties defAnnoProperties =AnnotationProperties.getDefault();


               String statusLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getStatusLineIndex());//状态注释行


               bais.reset();


               String sendPathLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getSendPathLineIndex());//状态注释行


               bais.reset();






               if(statusLine.contains("GH")){


                  //固化，不应回传，忽略


                  log.warn("状态{},不应回传，忽略",statusLine);


                  continue;


               }




               Machine machine = this.machineService.getMachineBySendPathAnnotation(sendPathLine);


               if(machine == null){


                  throw new ServiceException("根据下发路径未找到程序对应的机床:"+sendPathLine);


               }




               if(statusLine.contains("SQ")){


                  //试切


                  programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);


               }else if(statusLine.contains("GH")){


                  //固化


                  programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);


                  programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 还需根据机床组（如何获取？根据下发路径获取机床，进而获取），,processEdition


               }else if(statusLine.contains("PL")){


                  //偏离


                  programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);


                  programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);


               }else{


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


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


                  //TODO 现场编制的程序，打包时必须在文件中增加下发路径（加入后）


                  programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);


                  if(programPackageNode!=null){


                     String chechuangVal = paramService.turninngValue();


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


                        //车床


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


                        statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);


                     }


                  }


               }




               if(programPackageNode != null) {


                  progData.setId(programPackageNode.getId());


                  progData.setProgramNo(programPackageNode.getProgramNo());


@@ -172,10 +210,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+"包下未找到文件");


            }




         }


@@ -189,10 +227,10 @@


    * @param folderName 文件夹名


    * @return 结构数据


    */


   /*


   PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){


      int index = StringUtils.lastIndexOf(folderName,'-');


      String processEditon = "";


      String temp;


      String packageName = "";


      if(index != -1){


         processEditon = folderName.substring(index+1);


@@ -203,7 +241,7 @@


      result.setProgramPackageName(packageName);


      result.setProcessEdition(processEditon);


      return result;


   }


   }*/




   /**


    * 入库回传文件,并启动固化流程


@@ -251,11 +289,10 @@


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


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


            String programPackageName = pkgAndEdition.getProgramPackageName();


            //PackageAndProcessEdition pkgAndEdition = folderName;//parseProgramPackageFromFolderName(folderName);


            String programPackageName = folderName; //pkgAndEdition.getProgramPackageName();




            Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();




@@ -358,7 +395,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);


@@ -399,4 +436,7 @@


   private String programPackageName;


   private String processEdition;




   public String programName(){


      return programPackageName+"-"+processEdition;


   }


}