From 57eeaa6c4cc627e0748ba749d2383cb41c9678c6 Mon Sep 17 00:00:00 2001 From: Odboy Date: Wed, 18 Mar 2026 18:54:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dkey=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../odboy/constool/KitDiffSyncConstTool.java | 54 +++++++++---------- .../odboy/constool/KitDiffSyncConstTool.java | 54 +++++++++---------- .../odboy/constool/KitDiffSyncConstTool.java | 54 +++++++++---------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java index 82b526e3..129018ac 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java @@ -1,8 +1,8 @@ package cn.odboy.constool; import cn.hutool.core.collection.CollUtil; -import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.framework.exception.BadRequestException; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -97,7 +97,7 @@ public class KitDiffSyncConstTool { } // 构建本地数据的键值映射 - Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i)); + Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i, (oldest, newest) -> oldest)); List insertList = new ArrayList<>(); List updateCompareList = new ArrayList<>(); @@ -140,29 +140,29 @@ public class KitDiffSyncConstTool { } } - /** - * 使用示例 - */ - public static void main(String[] args) { - List localList = new ArrayList<>(); - List onlineList = new ArrayList<>(); - - KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); - diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { - @Override - public void doSaveBatch(List records) { - // 全量保存 - } - - @Override - public void doUpdateBatch(List localList, List compareList) { - // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 - } - - @Override - public void doDeleteBatch(List records) { - // 条件删除 - } - }); - } +// /** +// * 使用示例 +// */ +// public static void main(String[] args) { +// List localList = new ArrayList<>(); +// List onlineList = new ArrayList<>(); +// +// KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); +// diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { +// @Override +// public void doSaveBatch(List records) { +// // 全量保存 +// } +// +// @Override +// public void doUpdateBatch(List localList, List compareList) { +// // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 +// } +// +// @Override +// public void doDeleteBatch(List records) { +// // 条件删除 +// } +// }); +// } } diff --git a/cutejava-springboot4/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java b/cutejava-springboot4/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java index 82b526e3..129018ac 100644 --- a/cutejava-springboot4/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java +++ b/cutejava-springboot4/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java @@ -1,8 +1,8 @@ package cn.odboy.constool; import cn.hutool.core.collection.CollUtil; -import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.framework.exception.BadRequestException; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -97,7 +97,7 @@ public class KitDiffSyncConstTool { } // 构建本地数据的键值映射 - Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i)); + Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i, (oldest, newest) -> oldest)); List insertList = new ArrayList<>(); List updateCompareList = new ArrayList<>(); @@ -140,29 +140,29 @@ public class KitDiffSyncConstTool { } } - /** - * 使用示例 - */ - public static void main(String[] args) { - List localList = new ArrayList<>(); - List onlineList = new ArrayList<>(); - - KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); - diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { - @Override - public void doSaveBatch(List records) { - // 全量保存 - } - - @Override - public void doUpdateBatch(List localList, List compareList) { - // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 - } - - @Override - public void doDeleteBatch(List records) { - // 条件删除 - } - }); - } +// /** +// * 使用示例 +// */ +// public static void main(String[] args) { +// List localList = new ArrayList<>(); +// List onlineList = new ArrayList<>(); +// +// KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); +// diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { +// @Override +// public void doSaveBatch(List records) { +// // 全量保存 +// } +// +// @Override +// public void doUpdateBatch(List localList, List compareList) { +// // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 +// } +// +// @Override +// public void doDeleteBatch(List records) { +// // 条件删除 +// } +// }); +// } } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java index 82b526e3..129018ac 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/constool/KitDiffSyncConstTool.java @@ -1,8 +1,8 @@ package cn.odboy.constool; import cn.hutool.core.collection.CollUtil; -import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.framework.exception.BadRequestException; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -97,7 +97,7 @@ public class KitDiffSyncConstTool { } // 构建本地数据的键值映射 - Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i)); + Map localMap = localRecords.stream().collect(Collectors.toMap(keyMapper, i -> i, (oldest, newest) -> oldest)); List insertList = new ArrayList<>(); List updateCompareList = new ArrayList<>(); @@ -140,29 +140,29 @@ public class KitDiffSyncConstTool { } } - /** - * 使用示例 - */ - public static void main(String[] args) { - List localList = new ArrayList<>(); - List onlineList = new ArrayList<>(); - - KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); - diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { - @Override - public void doSaveBatch(List records) { - // 全量保存 - } - - @Override - public void doUpdateBatch(List localList, List compareList) { - // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 - } - - @Override - public void doDeleteBatch(List records) { - // 条件删除 - } - }); - } +// /** +// * 使用示例 +// */ +// public static void main(String[] args) { +// List localList = new ArrayList<>(); +// List onlineList = new ArrayList<>(); +// +// KitDiffSyncConstTool diffSyncTool = new KitDiffSyncConstTool<>(localList, onlineList); +// diffSyncTool.sync(KitBaseUserTimeTb::getCreateBy, new SyncCallback<>() { +// @Override +// public void doSaveBatch(List records) { +// // 全量保存 +// } +// +// @Override +// public void doUpdateBatch(List localList, List compareList) { +// // 将 compareList 中的数据，填充到对应的 localList 数据中，更新 localList 数据 +// } +// +// @Override +// public void doDeleteBatch(List records) { +// // 条件删除 +// } +// }); +// } }