机床新增数据库逐渐重复报错

yangys

2025-08-05 5f714d1dfafa201ac52da4ebb2cc3ff7a5e3a31f

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

@@ -132,8 +132,8 @@
      NcProgramExchange exchange;
      String pkgFileName = bladeRedis.get(getFileKey());

      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);

      for(NcNode pkgNode :newProgramPckageList){
         exchange = new NcProgramExchange();
@@ -144,17 +144,17 @@
         this.save(exchange);
      }

      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<>();
@@ -194,7 +194,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 +212,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,16 +231,16 @@
                  } 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);
         }

      }