From bfabc8bc4b22b352d339ee45c2f7516b62fcd116 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Fri, 29 Aug 2025 12:50:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(X-Pack):=20=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=B0=83=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8Quartz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/listener/XpackTaskStarter.java | 10 +++++++++ .../io/dataease/api/sync/task/dto/Source.java | 15 +++++++++++++ .../io/dataease/api/sync/task/dto/Target.java | 21 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java b/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java index eb83895a7c..7c002c30de 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java +++ b/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java @@ -2,6 +2,7 @@ package io.dataease.listener; import io.dataease.job.schedule.DeDataFillingTaskExecutor; import io.dataease.job.schedule.DeTaskExecutor; +import io.dataease.job.schedule.DeXpackDataSyncTaskExecutor; import io.dataease.license.utils.LicenseUtil; import io.dataease.utils.LogUtil; import jakarta.annotation.Resource; @@ -20,6 +21,9 @@ public class XpackTaskStarter implements ApplicationRunner { @Resource private DeDataFillingTaskExecutor deDataFillingTaskExecutor; + @Resource + private DeXpackDataSyncTaskExecutor deXpackDataSyncTaskExecutor; + @Override public void run(ApplicationArguments args) { try { @@ -34,5 +38,11 @@ public class XpackTaskStarter implements ApplicationRunner { } catch (Exception e) { LogUtil.error(e.getMessage(), e.getCause()); } + try { + LicenseUtil.validate(); + deXpackDataSyncTaskExecutor.init(); + } catch (Exception e) { + LogUtil.error(e.getMessage(), e.getCause()); + } } } diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java index 5fba8e1746..2a4110dadc 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java @@ -21,4 +21,19 @@ public class Source { private List fieldList; private String incrementField; private String esQuery; + + public Source() { + } + + public Source(Source source) { + this.type = source.type; + this.query = source.query; + this.tables = source.tables; + this.datasource = source.datasource; + this.datasourceId = source.datasourceId; + this.tableExtract = source.tableExtract; + this.fieldList = source.fieldList; + this.incrementField = source.incrementField; + this.esQuery = source.esQuery; + } } diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java index 8aae4df06e..1fed2f32e2 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java @@ -26,4 +26,25 @@ public class Target { private String remarks; private Long incrementOffset; private String incrementOffsetUnit; + + public Target() { + } + + public Target(Target target) { + this.type = target.type; + this.createTable = target.createTable; + this.fieldList = target.fieldList; + this.tableName = target.tableName; + this.datasource = target.datasource; + this.datasourceId = target.datasourceId; + this.targetProperty = target.targetProperty; + this.incrementSync = target.incrementSync; + this.incrementField = target.incrementField; + this.datasourceVersion = target.datasourceVersion; + this.faultToleranceRate = target.faultToleranceRate; + this.incrementFieldType = target.incrementFieldType; + this.remarks = target.remarks; + this.incrementOffset = target.incrementOffset; + this.incrementOffsetUnit = target.incrementOffsetUnit; + } }