Browse Source

禁用同步的删除功能.

dev-V1.10.2-temp
zhuibobo 3 months ago
parent
commit
06ffe8914d
  1. 28
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/controller/BizSyncManageController.java
  2. 5
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java

28
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") // @PostMapping("/trigger-force")
public R<String> triggerForce() { // public R<String> triggerForce() {
log.info("[BizSync] 手动强制全量同步"); // log.info("[BizSync] 手动强制全量同步");
String jobId = jobStatusHolder.createJob("TRIGGER_FORCE", null); // String jobId = jobStatusHolder.createJob("TRIGGER_FORCE", null);
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
scheduler.runAllForce(); // scheduler.runAllForce();
jobStatusHolder.markSuccess(jobId, "强制全量同步完成"); // jobStatusHolder.markSuccess(jobId, "强制全量同步完成");
} catch (Exception e) { // } catch (Exception e) {
jobStatusHolder.markFail(jobId, e.getMessage()); // jobStatusHolder.markFail(jobId, e.getMessage());
} // }
}, SYNC_EXECUTOR); // }, SYNC_EXECUTOR);
return R.ok(jobId); // return R.ok(jobId);
} // }
/** /**
* 查询异步任务状态(前端轮询用) * 查询异步任务状态(前端轮询用)

5
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/resolver/RowMergeResolver.java

@ -24,8 +24,9 @@ public class RowMergeResolver {
* 删除同步是否允许(全局总闸 + 表级 deleteMode) * 删除同步是否允许(全局总闸 + 表级 deleteMode)
*/ */
private boolean deleteAllowed(SyncTableConfig config) { private boolean deleteAllowed(SyncTableConfig config) {
return syncProperties.isDeleteSyncEnabled() return false;
&& !"none".equalsIgnoreCase(config.getDeleteMode()); // return syncProperties.isDeleteSyncEnabled()
// && !"none".equalsIgnoreCase(config.getDeleteMode());
} }
/** /**

Loading…
Cancel
Save