yangys
2025-08-06 1911be8941e5fe2705c2c56e74e52bd426468793
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -88,8 +88,7 @@
   List<DncSendBackData> parseDncZipFromByteArray(InputStream inputStream) throws IOException {
      List<DncSendBackData> list = new ArrayList<>();
      Path tempZipFile = createTempFile(inputStream);
      //Map<String,String> fileMd5Map = new HashMap<>();
      Map<String,DncSendBackData> fileDataMap = new HashMap<>();
      try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
         ZipEntry entry;
@@ -130,11 +129,13 @@
      List<Long> idList = Func.toLongList(ids);
      //
      NcProgramExchange exchange;
      String pkgFileName = bladeRedis.get(getFileKey());
      String filekey = getFileKey();
      String pkgFileName = bladeRedis.get(filekey);
      log.info("filekey={},文件名={}",filekey,pkgFileName);
      Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
      List<NcNode> newProgramPckageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      log.info("需要启动固化流程的程序包名数量:{}",newProgramPckageList.size());
      for(NcNode pkgNode :newProgramPckageList){
         exchange = new NcProgramExchange();
         exchange.setName(pkgNode.getName());
@@ -143,6 +144,9 @@
         this.save(exchange);
      }
      bladeRedis.del(filekey);
      this.ossTemplate.removeFile(pkgFileName);
      log.info("删除oss文件:{}",pkgFileName);
      cureFlowService.startCure(newProgramPckageList,programPackageSubMap);
   }
@@ -172,6 +176,7 @@
         List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
         for(String dir : dirList){
            String programPackageName = StringUtils.removeEnd(dir,"/");
            NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
            if(oriProgramPkg == null){
               log.warn("未发现匹配的程序包名{}",programPackageName);
@@ -180,6 +185,7 @@
            if(!programPackageIdList.contains(oriProgramPkg.getId())){
               //不在勾选的范围内
               log.info("{}不在勾选范围内",programPackageName);
               continue;
            }
            NcNode newProgramPkg = new NcNode();
@@ -244,6 +250,8 @@
         }
      }
      return newProgramPackageNodeList;
   }