From 06ffe8914d0b64261f7df3a889145f9b5e283f52 Mon Sep 17 00:00:00 2001
From: zhuibobo <zhuibobo@qq.com>
Date: Sun, 2 Aug 2026 09:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=8C=E6=AD=A5=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BizSyncManageController.java   | 28 +++++++++----------
 .../resolver/RowMergeResolver.java            |  5 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

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<String> 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<String> 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());
     }
 
     /**