机床加字段

yangys

2025-09-19 b0d0191a88912b352385349461b500a4964d693b

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

@@ -16,6 +16,7 @@
import org.springblade.mdm.machinefile.service.FileSendRecordService;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.service.programannotation.AnnotationProperties;
import org.springblade.mdm.program.vo.MdmProgramImportVO;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,15 +87,6 @@
         extractZipToTempDir(tempZipFile,extractDir);

         //读取文件目录
         /*
         BladeFile bfile = ossTemplate.putFile(file);//上传，供后续入库使用

         //设置一个缓存，2小时过期
         InputStream zipFileInputStream = file.getInputStream();//test

         byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
         list = parseMdmZipFromByteArray(bytes);
         */
         list = readTempDir(extractDir);
      } catch (IOException e) {
         log.error("导入涉密网摆渡文件失败",e);
@@ -109,9 +101,6 @@
      Path tempPath = Paths.get(tempDir);

      // 创建解压目标目录（在临时目录下创建一个唯一子目录）
      //Path extractDir = Files.createTempDirectory(tempPath, "unzip_");
      System.out.println("解压目录: " + extractDir.toString());
      //Files.newInputStream(Paths.get(zipFilePath));
      try (InputStream fis = Files.newInputStream(zipFilePath);
          ZipInputStream zis = new ZipInputStream(fis)) {

@@ -161,51 +150,16 @@

      return normalizePath;
   }
   /*
   public static List<MdmProgramImportVO> parseMdmZipFromByteArray(byte[] zipData) throws IOException {
      List<MdmProgramImportVO> list = new ArrayList<>();
      Map<String,String> fileMd5Map = new HashMap<>();
      Map<String,MdmProgramImportVO> fileDataMap = new HashMap<>();
      try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(zipData);
          ZipFile zipFile = new ZipFile(channel)) {

         ZipArchiveEntry entry;
         Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
         while (entries.hasMoreElements()) {
            entry = entries.nextElement();

            String entryName = entry.getName();

            if (!entry.isDirectory()) {
               //直接解析程序的json文件


            }

         }

      }
      //设置md5值
      fileDataMap.forEach((k,v)->{
         if(fileMd5Map.containsKey(k)){
            v.setMd5(fileMd5Map.get(k));
         }
      });
      return list;
   }
   */

   public List<MdmProgramImportVO> readTempDir(Path extractDir) throws IOException {
      List<MdmProgramImportVO> list = new ArrayList<>();

      List<Machine> machines = machineService.lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
      //List<Machine> machines = machineService.getEnableMachines();
      //读取所有文件夹
      //List<Path> dirs = Files.list(extractDir).filter(Files::isDirectory).toList();
      try (DirectoryStream<Path> stream = Files.newDirectoryStream(extractDir)) {
         for (Path path : stream) {
            if (Files.isDirectory(path)) {



               // 如果是子目录，读取其中的文件
               try (DirectoryStream<Path> subStream = Files.newDirectoryStream(path)) {
@@ -215,8 +169,6 @@
                     }
                  }
               }
               //vo.setFiles(files);

            } else if (Files.isRegularFile(path)) {
               System.out.println("找到文件2: " + path);
               //这里 找到的文件不是
@@ -237,19 +189,25 @@
               try (InputStream inputStream = Files.newInputStream(path, StandardOpenOption.READ)) {
                  // 使用输入流读取文件内容
                  ByteArrayInputStream bas = new ByteArrayInputStream(inputStream.readAllBytes());
                  String line1 = FileContentUtil.readLineAt(bas,1);

                  AnnotationProperties defAnnoProperties = AnnotationProperties.getDefault();
                  String sendPathLine = FileContentUtil.readLineAt(bas,defAnnoProperties.getSendPathLineIndex());
                  //bas.mark(0);
                  bas.reset();
                  String line2 = FileContentUtil.readLineAt(bas,2);
                  System.out.println("line1="+line1);
                  Machine matchedMachine = null;
                  String statusLine = FileContentUtil.readLineAt(bas,defAnnoProperties.getStatusLineIndex());
                  log.info("sendPathLine={}", sendPathLine);

                  Machine matchedMachine = machineService.getMachineBySendPathAnnotation(sendPathLine);
                  /*
                  for (Machine machine : machines) {
                     if(Func.isNotBlank(machine.getProgSendDir()) && line1.contains(machine.getProgSendDir())){
                     if(Func.isNotBlank(machine.getProgSendDir()) && sendPathLine.contains(machine.getProgSendDir())){
                        matchedMachine = machine;
                        break;
                     }

                  }

                   */
                  if (matchedMachine != null) {
                     vo.setName(parseProgramName(vo.getFilename()));
                     vo.setMachineCode(matchedMachine.getCode());
@@ -257,7 +215,7 @@
                     vo.setFullPath(path.toString());//文件地址
                     vo.setSendPath(matchedMachine.getProgSendDir());
                     vo.setId(vo.getFullPath());
                     vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line2));
                     vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getControlSystem(),statusLine));

                     list.add(vo);
                  }