yangys
2025-08-04 1130aee058b7f47f2df56ebd0e2934392102c354
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -147,7 +147,7 @@
         this.save(exchange);
      }
      cureFlowService.startCure(pkgList);
      //cureFlowService.startCure(pkgList);
   }
   /**
@@ -181,26 +181,46 @@
               log.warn("未发现匹配的程序包名{}",programPackageName);
               continue;
            }
            if(!programPackageIdList.contains(oriProgramPkg.getId())){
               //不在勾选的范围内
               continue;
            }
            //临时测试注释
            /*
            NcNode newProgramPkg = new NcNode();
            BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
            newProgramPkg.setId(null);
            clearBaseProperties(newProgramPkg);
            newProgramPkg.setIsLastEdition(1);
            newProgramPkg.setCreateTime(null);
            newProgramPkg.setUpdateTime(null);
            newProgramPkg.setCreateUser(null);
            newProgramPkg.setUpdateUser(null);
            ncNodeService.save(newProgramPkg);
            //旧数据更新为老版本
            oriProgramPkg.setIsLastEdition(0);;
            ncNodeService.save(oriProgramPkg);
            */
            ncNodeService.updateById(oriProgramPkg);
            //查找包下的文件数据,
            entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
               log.info(dir+"下的文件:{}",entryName);
               log.info("{}下的文件:{}",dir,entryName);
               if(!entryName.endsWith("/")){
                  //实际的文件
                  String fileName = StringUtils.removeStart(entryName,dir);//去除文件名路径部分
                  NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,oriProgramPkg.getId());
                  if(oldProgramNode == null){
                     log.info("{}找不到程序文件",entryName);
                     return;
                  }
                  NcNode newProgramNode = new NcNode();
                  BeanUtils.copyProperties(oriProgramPkg, newProgramNode);
                  clearBaseProperties(newProgramNode);
                  newProgramNode.setIsLastEdition(1);
                  ncNodeService.save(newProgramNode);
                  ncNodeService.updateById(oriProgramPkg);
               }
            });
         }
@@ -215,4 +235,13 @@
      entity.setCreateUser(jsonObject.getLong("createUser"));
      entity.setUpdateUser(jsonObject.getLong("updateUser"));
   }
   void clearBaseProperties(BizEntity entity){
      entity.setId(null);
      entity.setCreateTime(null);
      entity.setUpdateTime(null);
      entity.setStatus(null);
      entity.setCreateUser(null);
      entity.setUpdateUser(null);
   }
}