解决偏离单再次回传验证问题

yangys

2025-08-23 88f640713525e88dac333ea3bf7e23e22891ab0f

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

@@ -78,7 +78,6 @@
         bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));

         try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
            //InputStream zipFileInputStream = file.getInputStream();//test
            list = parseProgramListFromZip(zipFileInputStream);
         }
      } catch (IOException e) {
@@ -211,27 +210,8 @@
      String zipFileName = bladeRedis.get(filekey);
      log.info("filekey={},文件名={}",filekey,zipFileName);

      //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();

      Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);

      ///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      //updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      /*
      log.info("需要启动固化流程的程序包名数量:{}",newProgramPackageList.size());
      for(NcNode pkgNode :newProgramPackageList){
         exchange = new NcProgramExchange();
         exchange.setName(pkgNode.getName());
         exchange.setExchangeType(2);//回传
         exchange.setNcNodeId(pkgNode.getId());

         this.save(exchange);
      }*/
      //bladeRedis.del(filekey);
      //this.ossTemplate.removeFile(zipFileName);
      //log.info("删除oss文件:{}",zipFileName);

      //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
      cureFlowService.startCureNew(pkgIdFileMap);

   }
@@ -263,7 +243,12 @@
         //根据内部文件，读取和分析程序包和程序文件数据
         List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
         for(String dir : dirList){
            String programPackageName = StringUtils.removeEnd(dir,"/");
            String programPackageName1 = StringUtils.removeEnd(dir,"/");
            String folderName = StringUtils.removeEnd(dir,"/");

            PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
            String programPackageName = pkgAndEdition.getProgramPackageName();

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

            if(optPackageNode.isEmpty()){
@@ -275,8 +260,12 @@
               throw new ServiceException(programPackageName + "已经固化，请勿重复入库。");
            }

            //偏离程序判断是否重复回传
            if(packageNode.isDeviationProgram() && packageNode.hasLocked()) {
               throw new ServiceException(programPackageName + "已锁定的程序不可以再次回传。");
            }

            //检查是否在审批过程中
            //根据节点信息查询流程
            boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
            if(active){
               throw new ServiceException(programPackageName+"正在审批中，请勿等待审批完成。");