diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index aafba17..1e2c9ee 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -556,7 +556,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl deepCopyImport = JSONUtil.toList(JSONUtil.toJsonStr(importFiles), EdFileInfo.class); List deepCopyDb = JSONUtil.toList(JSONUtil.toJsonStr(dbFileInfos), EdFileInfo.class); - // 导入的文件在线下已经被废除了 + // 导入的文件在线下已经被废除了,不同步到线上 Optional first = deepCopyImport.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst(); if (first.isEmpty()) { continue; @@ -573,8 +573,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl importVersionRelation = getVersionRelation(deepCopyImport); Map dbVersionRelation = getVersionRelation(deepCopyDb); - dbVersionRelation.putAll(importVersionRelation); + //************************** int start = FILE_START_VERSION; List saveObjs = new ArrayList<>(); + importFiles = importFiles.stream().distinct().toList(); for (EdFileInfo importFileInfo : importFiles) { // 该文件在数据库中存在,是从线上导出的。 if (dbIdMap.containsKey(importFileInfo.getId())) { @@ -594,14 +597,17 @@ public class EdFileInfoServiceImpl extends ServiceImpl