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<FlowProgramFile>> programPackageFileMap = new HashMap<>();
      List<NcNode> newProgramPckageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageFileMap);
      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,18 +144,21 @@
         this.save(exchange);
      }
      bladeRedis.del(filekey);
      this.ossTemplate.removeFile(pkgFileName);
      log.info("删除oss文件:{}",pkgFileName);
      cureFlowService.startCure(newProgramPckageList,programPackageFileMap);
      cureFlowService.startCure(newProgramPckageList,programPackageSubMap);
   }
   /**
    * 更新节点,主要是创建 程序包名 的新版本。
    * @param pkgFileName zip文件名
    * @param programPackageIdList 程序包名 节点的id列表
    * @param programPackageFileMap 新的 程序包节点id -> =文件列表 map,用于回传数据
    * @param programPackageSubMap 新的 程序包节点id -> =文件列表 map,用于回传数据
    * @throws IOException 访问文件异常
    */
   List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<FlowProgramFile>> programPackageFileMap) throws IOException {
   List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<NcNode>> programPackageSubMap) throws IOException {
      InputStream inputStream = this.ossTemplate.statFileStream(pkgFileName);
      Path tempZipFile = createTempFile(inputStream);
      List<NcNode> newProgramPackageNodeList = new ArrayList<>();
@@ -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();
@@ -194,7 +200,8 @@
            oriProgramPkg.setIsLastEdition(0);;
            ncNodeService.updateById(oriProgramPkg);
            List<FlowProgramFile> newFlowFiles = new ArrayList<>();
            //List<FlowProgramFile> newFlowFiles = new ArrayList<>();
            List<NcNode> newProgramNodes = new ArrayList<>();
            //查找包下的文件数据,
            entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
               log.info("{}下的文件:{}",dir,entryName);
@@ -211,9 +218,9 @@
                  BeanUtils.copyProperties(oldProgramNode, newProgramNode);
                  clearBaseProperties(newProgramNode);
                  newProgramNode.setIsLastEdition(1);
                  newProgramNode.setParentId(newProgramPkg.getParentId());
                  newProgramNode.setParentId(newProgramPkg.getId());
                  newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
                  ncNodeService.save(newProgramNode);
                  //ncNodeService.save(newProgramNode);
                  //将回传文件上传,并记录到数据库
                  FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
@@ -230,19 +237,21 @@
                  } catch (IOException e) {
                     throw new RuntimeException(e);
                  }
                  newFlowFiles.add(newFlowFile);
                  newProgramNode.setFlowProgramFile(newFlowFile);
                  newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
                  newProgramNodes.add(newProgramNode);
                  oldProgramNode.setIsLastEdition(0);
                  oldProgramNode.setIsLocked(1);
                  ncNodeService.updateById(oldProgramNode);
               }
            });
            programPackageFileMap.put(newProgramPkg.getId(),newFlowFiles);
            programPackageSubMap.put(newProgramPkg.getId(),newProgramNodes);
         }
      }
      return newProgramPackageNodeList;
   }