diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/controller/BizSyncManageController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/controller/BizSyncManageController.java index 9376bf7d..89cd5dc6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/controller/BizSyncManageController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/controller/BizSyncManageController.java @@ -87,20 +87,20 @@ public class BizSyncManageController { /** * 强制全量同步(异步) */ - @PostMapping("/trigger-force") - public R triggerForce() { - log.info("[BizSync] 手动强制全量同步"); - String jobId = jobStatusHolder.createJob("TRIGGER_FORCE", null); - CompletableFuture.runAsync(() -> { - try { - scheduler.runAllForce(); - jobStatusHolder.markSuccess(jobId, "强制全量同步完成"); - } catch (Exception e) { - jobStatusHolder.markFail(jobId, e.getMessage()); - } - }, SYNC_EXECUTOR); - return R.ok(jobId); - } +// @PostMapping("/trigger-force") +// public R triggerForce() { +// log.info("[BizSync] 手动强制全量同步"); +// String jobId = jobStatusHolder.createJob("TRIGGER_FORCE", null); +// CompletableFuture.runAsync(() -> { +// try { +// scheduler.runAllForce(); +// jobStatusHolder.markSuccess(jobId, "强制全量同步完成"); +// } catch (Exception e) { +// jobStatusHolder.markFail(jobId, e.getMessage()); +// } +// }, SYNC_EXECUTOR); +// return R.ok(jobId); +// } /** * 查询异步任务状态(前端轮询用) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java index cf3f2d9a..0e377887 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java @@ -24,8 +24,9 @@ public class RowMergeResolver { * 删除同步是否允许(全局总闸 + 表级 deleteMode) */ private boolean deleteAllowed(SyncTableConfig config) { - return syncProperties.isDeleteSyncEnabled() - && !"none".equalsIgnoreCase(config.getDeleteMode()); + return false; +// return syncProperties.isDeleteSyncEnabled() +// && !"none".equalsIgnoreCase(config.getDeleteMode()); } /**