You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ga...@apache.org on 2023/07/12 09:40:18 UTC
[seatunnel-web] branch add_canvas_job_define updated: [ADD][FUNCTION]Add synchronization task instance function (#65)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch add_canvas_job_define
in repository https://gitbox.apache.org/repos/asf/seatunnel-web.git
The following commit(s) were added to refs/heads/add_canvas_job_define by this push:
new 681b0049 [ADD][FUNCTION]Add synchronization task instance function (#65)
681b0049 is described below
commit 681b004931215e40e36a67a905b3b88be1cab6aa
Author: zhangchengming601 <86...@users.noreply.github.com>
AuthorDate: Wed Jul 12 17:40:12 2023 +0800
[ADD][FUNCTION]Add synchronization task instance function (#65)
---
pom.xml | 25 +-
.../ElasticSearchDataSourceChannel.java | 2 +-
.../sqlserver/jdbc/SqlServerDataSourceChannel.java | 8 +-
.../datasource-kafka/pom.xml | 6 +
.../datasource-mysql-cdc/pom.xml | 6 +
.../cdc/mysql/MysqlCDCDataSourceChannel.java | 3 +-
.../datasource-s3-redshift/pom.xml | 2 +-
.../sqlserver/SqlServerCDCDataSourceChannel.java | 3 +-
seatunnel-server/seatunnel-app/pom.xml | 57 +-
.../org/apache/seatunnel/app/common/Result.java | 2 +-
.../app/controller/JobExecutorController.java | 72 +
.../app/controller/JobMetricsController.java | 61 +
.../seatunnel/app/controller/ScriptController.java | 310 ++--
.../seatunnel/app/controller/TaskController.java | 255 +--
.../app/controller/TaskInstanceController.java | 50 +
.../seatunnel/app/dal/dao/IJobDefinitionDao.java | 4 +-
.../seatunnel/app/dal/dao/IJobInstanceDao.java | 14 +
.../app/dal/dao/IJobInstanceHistoryDao.java | 2 +-
.../seatunnel/app/dal/dao/IJobMetricsDao.java | 2 +-
.../app/dal/dao/impl/JobDefinitionDaoImpl.java | 7 +-
.../app/dal/dao/impl/JobInstanceDaoImpl.java | 30 +
.../dal/dao/impl/JobInstanceHistoryDaoImpl.java | 2 +-
.../app/dal/dao/impl/JobMetricsDaoImpl.java | 5 +-
.../seatunnel/app/dal/entity/JobInstance.java | 6 +
.../app/dal/mapper/JobInstanceMapper.java | 18 +-
.../apache/seatunnel/app/dal/mapper/JobMapper.java | 2 +
.../seatunnel/app/dal/mapper/JobMetricsMapper.java | 3 +-
.../domain/dto/job/SeaTunnelJobInstanceDto.java | 17 +
.../seatunnel/app/domain/response/PageInfo.java | 13 +
.../domain/response/executor/JobExecutorRes.java | 2 +
.../apache/seatunnel/app/service/BaseService.java | 9 +
.../seatunnel/app/service/IJobExecutorService.java | 12 +
.../seatunnel/app/service/IJobInstanceService.java | 8 +-
.../seatunnel/app/service/IJobMetricsService.java | 31 +-
.../seatunnel/app/service/IScriptService.java | 51 +-
.../app/service/ITaskInstanceService.java | 17 +
.../apache/seatunnel/app/service/ITaskService.java | 40 +-
.../app/service/impl/BaseServiceImpl.java | 22 +
.../app/service/impl/JobDefinitionServiceImpl.java | 2 +-
.../app/service/impl/JobExecutorServiceImpl.java | 207 +++
.../app/service/impl/JobInstanceServiceImpl.java | 24 +-
.../app/service/impl/JobMetricsServiceImpl.java | 483 +++++-
.../app/service/impl/ScriptServiceImpl.java | 520 +++---
.../app/service/impl/TaskInstanceServiceImpl.java | 173 ++
.../app/service/impl/TaskServiceImpl.java | 914 +++++-----
.../impl/BaseJdbcDataSourceConfigSwitcher.java | 2 +-
.../engine/SeaTunnelEngineMetricsExtractor.java | 209 +++
.../thirdparty/engine/SeaTunnelEngineProxy.java | 33 +
.../framework/SeaTunnelOptionRuleWrapper.java | 2 +
.../metrics/IEngineMetricsExtractor.java | 6 +
.../org/apache/seatunnel/app/utils/PageInfo.java | 130 ++
.../seatunnel/app/dal/mapper/JobInstanceMapper.xml | 35 +-
.../apache/seatunnel/app/dal/mapper/JobMapper.xml | 11 +
.../dolphinscheduler/IDolphinschedulerService.java | 144 +-
.../impl/DolphinschedulerServiceImpl.java | 1786 +++++++++++---------
.../dolphinscheduler/impl/InstanceServiceImpl.java | 174 +-
.../dolphinscheduler/impl/JobServiceImpl.java | 581 ++++---
57 files changed, 4129 insertions(+), 2486 deletions(-)
diff --git a/pom.xml b/pom.xml
index a8900c87..dc3af7dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,11 @@
<h2.version>2.1.214</h2.version>
<junit.version>5.9.0</junit.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
+ <commons-lang3.version>3.4</commons-lang3.version>
<guava.version>19.0</guava.version>
<checker.qual.version>3.10.0</checker.qual.version>
<awaitility.version>4.2.0</awaitility.version>
- <seatunnel-framework.version>2.4.5-WS-SNAPSHOT</seatunnel-framework.version>
+ <seatunnel-framework.version>2.4.7-WS-SNAPSHOT</seatunnel-framework.version>
<redshift.version>2.1.0.9</redshift.version>
<hadoop-aws.version>3.1.4</hadoop-aws.version>
<aws-java-sdk-bundle.version>1.11.271</aws-java-sdk-bundle.version>
@@ -433,7 +433,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${seatunnel-framework.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -488,7 +487,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-hadoop3-3.1.4-uber</artifactId>
<version>${hadoop-uber.version}</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.avro</groupId>
@@ -582,7 +580,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-kafka</artifactId>
<version>${seatunnel-framework.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -636,7 +633,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${seatunnel-framework.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -858,13 +854,11 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-cdc-mysql</artifactId>
<version>${seatunnel-framework.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-cdc-sqlserver</artifactId>
<version>${seatunnel-framework.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -877,6 +871,21 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-cdc-sqlserver</artifactId>
+ <version>${seatunnel-framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-cdc-mysql</artifactId>
+ <version>${seatunnel-framework.version}</version>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-elasticsearch/src/main/java/org/apache/seatunnel/datasource/plugin/elasticsearch/ElasticSearchDataSourceChannel.java b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-elasticsearch/src/main/java/org/apache/seatunnel/datasource/plugin/elasticsearch/ElasticSearchDataSourceChannel.java
index 6a4d9243..989e45fd 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-elasticsearch/src/main/java/org/apache/seatunnel/datasource/plugin/elasticsearch/ElasticSearchDataSourceChannel.java
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-elasticsearch/src/main/java/org/apache/seatunnel/datasource/plugin/elasticsearch/ElasticSearchDataSourceChannel.java
@@ -118,7 +118,7 @@ public class ElasticSearchDataSourceChannel implements DataSourceChannel {
}
private static void databaseCheck(@NonNull String database) {
- if (!StringUtils.equalsAnyIgnoreCase(database, DATABASE)) {
+ if (!StringUtils.equalsIgnoreCase(database, DATABASE)) {
throw new IllegalArgumentException("database not found: " + database);
}
}
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-sqlserver/src/main/java/org/apache/seatunnel/datasource/plugin/sqlserver/jdbc/SqlServerDataSourceChannel.java b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-sqlserver/src/main/java/org/apache/seatunnel/datasource/plugin/sqlserver/jdbc/SqlServerDataSourceChannel.java
index 7a32f86a..6ad2e9eb 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-sqlserver/src/main/java/org/apache/seatunnel/datasource/plugin/sqlserver/jdbc/SqlServerDataSourceChannel.java
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-sqlserver/src/main/java/org/apache/seatunnel/datasource/plugin/sqlserver/jdbc/SqlServerDataSourceChannel.java
@@ -78,11 +78,13 @@ public class SqlServerDataSourceChannel implements DataSourceChannel {
@NonNull String pluginName, @NonNull Map<String, String> requestParams) {
List<String> dbNames = new ArrayList<>();
try (Connection connection = getConnection(requestParams);
- PreparedStatement statement = connection.prepareStatement("SHOW DATABASES;");
+ PreparedStatement statement =
+ connection.prepareStatement(
+ "SELECT name FROM sys.databases WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb');");
ResultSet re = statement.executeQuery()) {
// filter system databases
while (re.next()) {
- String dbName = re.getString("database");
+ String dbName = re.getString("name");
if (StringUtils.isNotBlank(dbName)
&& !SqlServerDataSourceConfig.SQLSERVER_SYSTEM_DATABASES.contains(dbName)) {
dbNames.add(dbName);
@@ -111,7 +113,7 @@ public class SqlServerDataSourceChannel implements DataSourceChannel {
@NonNull String database,
@NonNull String table) {
List<TableField> tableFields = new ArrayList<>();
- try (Connection connection = getConnection(requestParams, database)) {
+ try (Connection connection = getConnection(requestParams, null)) {
DatabaseMetaData metaData = connection.getMetaData();
String primaryKey = getPrimaryKey(metaData, database, table);
try (ResultSet resultSet = metaData.getColumns(database, null, table, null)) {
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-kafka/pom.xml b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-kafka/pom.xml
index 64a90557..a94058a9 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-kafka/pom.xml
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-kafka/pom.xml
@@ -33,6 +33,12 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>datasource-plugins-api</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>common-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/pom.xml b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/pom.xml
index c7d565f8..e8c6d4e8 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/pom.xml
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/pom.xml
@@ -33,6 +33,12 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>datasource-plugins-api</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>common-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/mysql/MysqlCDCDataSourceChannel.java b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/mysql/MysqlCDCDataSourceChannel.java
index dd26ac14..1b63a97d 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/mysql/MysqlCDCDataSourceChannel.java
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-mysql-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/mysql/MysqlCDCDataSourceChannel.java
@@ -234,8 +234,7 @@ public class MysqlCDCDataSourceChannel implements DataSourceChannel {
private boolean isNotSystemDatabase(String dbName) {
return MYSQL_SYSTEM_DATABASES.stream()
- .noneMatch(
- systemDatabase -> StringUtils.equalsAnyIgnoreCase(systemDatabase, dbName));
+ .noneMatch(systemDatabase -> StringUtils.equalsIgnoreCase(systemDatabase, dbName));
}
private boolean convertToBoolean(Object value) {
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-s3-redshift/pom.xml b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-s3-redshift/pom.xml
index 3f7e0e6e..1fc2d6b2 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-s3-redshift/pom.xml
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-s3-redshift/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-hadoop3-3.1.4-uber</artifactId>
- <version>${seatunnel-framework.version}</version>
+ <version>2.4.5-WS-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.avro</groupId>
diff --git a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-sqlserver-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/sqlserver/SqlServerCDCDataSourceChannel.java b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-sqlserver-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/sqlserver/SqlServerCDCDataSourceChannel.java
index 20a23fae..8a3d39c1 100644
--- a/seatunnel-datasource/seatunnel-datasource-plugins/datasource-sqlserver-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/sqlserver/SqlServerCDCDataSourceChannel.java
+++ b/seatunnel-datasource/seatunnel-datasource-plugins/datasource-sqlserver-cdc/src/main/java/org/apache/seatunnel/datasource/plugin/cdc/sqlserver/SqlServerCDCDataSourceChannel.java
@@ -208,8 +208,7 @@ public class SqlServerCDCDataSourceChannel implements DataSourceChannel {
private boolean isNotSystemDatabase(String dbName) {
return MYSQL_SYSTEM_DATABASES.stream()
- .noneMatch(
- systemDatabase -> StringUtils.equalsAnyIgnoreCase(systemDatabase, dbName));
+ .noneMatch(systemDatabase -> StringUtils.equalsIgnoreCase(systemDatabase, dbName));
}
private boolean convertToBoolean(Object value) {
diff --git a/seatunnel-server/seatunnel-app/pom.xml b/seatunnel-server/seatunnel-app/pom.xml
index 60264695..f6e585cd 100644
--- a/seatunnel-server/seatunnel-app/pom.xml
+++ b/seatunnel-server/seatunnel-app/pom.xml
@@ -25,6 +25,20 @@
<artifactId>seatunnel-app</artifactId>
<dependencies>
+
+ <!-- https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations -->
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>2.2.14</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-common</artifactId>
@@ -61,6 +75,13 @@
<version>${project.version}</version>
</dependency>
+ <!--hutool工具-->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.16</version>
+ </dependency>
+
<!--transforms-->
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -142,6 +163,14 @@
<artifactId>connector-jdbc</artifactId>
<!-- <scope>test</scope>-->
</dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-cdc-mysql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-cdc-sqlserver</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-socket</artifactId>
@@ -317,11 +346,6 @@
<artifactId>connector-maxcompute</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>connector-cdc-mysql</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-cdc-sqlserver</artifactId>
@@ -419,9 +443,11 @@
</exclusions>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
</dependency>
<dependency>
@@ -508,6 +534,18 @@
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>datasource-mysql-cdc</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>datasource-sqlserver-cdc</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -525,6 +563,15 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-engine-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/common/Result.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/common/Result.java
index e08323ff..5b03b2a4 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/common/Result.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/common/Result.java
@@ -29,7 +29,7 @@ public class Result<T> {
private T data;
- private Result() {
+ public Result() {
this.data = null;
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobExecutorController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobExecutorController.java
new file mode 100644
index 00000000..392c672b
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobExecutorController.java
@@ -0,0 +1,72 @@
+package org.apache.seatunnel.app.controller;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.domain.response.executor.JobExecutorRes;
+import org.apache.seatunnel.app.service.IJobExecutorService;
+import org.apache.seatunnel.app.service.IJobInstanceService;
+import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
+import org.apache.seatunnel.server.common.SeatunnelException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.annotation.Resource;
+
+import java.io.IOException;
+
+/** @Description @ClassName JobExecutorController @Author zhang @Date 2023/6/30 15:09 */
+@Slf4j
+@RequestMapping("/seatunnel/api/v1/job/executor")
+@RestController
+public class JobExecutorController {
+
+ @Autowired IJobExecutorService jobExecutorService;
+ @Resource private IJobInstanceService jobInstanceService;
+
+ @GetMapping("/execute")
+ @ApiOperation(value = "Execute synchronization tasks", httpMethod = "GET")
+ public Result jobExecutor(
+ @ApiParam(value = "userId", required = true) @RequestAttribute("userId") Integer userId,
+ @ApiParam(value = "jobDefineId", required = true) @RequestParam("jobDefineId")
+ Long jobDefineId) {
+ return jobExecutorService.jobExecute(userId, jobDefineId);
+ }
+
+ @GetMapping("/resource")
+ @ApiOperation(value = "get the resource for job executor", httpMethod = "GET")
+ public Result<JobExecutorRes> resource(
+ @ApiParam(value = "userId", required = true) @RequestParam Integer userId,
+ @ApiParam(value = "Job define id", required = true) @RequestParam Long jobDefineId)
+ throws IOException {
+ try {
+ JobExecutorRes executeResource =
+ jobInstanceService.createExecuteResource(userId, jobDefineId);
+ return Result.success(executeResource);
+ } catch (Exception e) {
+ log.error("Get the resource for job executor error", e);
+ throw new SeatunnelException(SeatunnelErrorEnum.ILLEGAL_STATE, e.getMessage());
+ }
+ }
+
+ @GetMapping("/pause")
+ public Result jobPause(
+ @ApiParam(value = "userId", required = true) @RequestAttribute("userId") Integer userId,
+ @ApiParam(value = "jobInstanceId", required = true) @RequestParam Long jobInstanceId) {
+ return jobExecutorService.jobPause(userId, jobInstanceId);
+ }
+
+ @GetMapping("/restore")
+ public Result jobRestore(
+ @ApiParam(value = "userId", required = true) @RequestAttribute("userId") Integer userId,
+ @ApiParam(value = "jobInstanceId", required = true) @RequestParam Long jobInstanceId) {
+ return jobExecutorService.jobStore(userId, jobInstanceId);
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobMetricsController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobMetricsController.java
new file mode 100644
index 00000000..bd8bd31d
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobMetricsController.java
@@ -0,0 +1,61 @@
+package org.apache.seatunnel.app.controller;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.domain.response.metrics.JobDAG;
+import org.apache.seatunnel.app.domain.response.metrics.JobPipelineDetailMetricsRes;
+import org.apache.seatunnel.app.domain.response.metrics.JobPipelineSummaryMetricsRes;
+import org.apache.seatunnel.app.service.IJobMetricsService;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.annotation.Resource;
+
+import java.io.IOException;
+import java.util.List;
+
+/** @Description @ClassName JobMetricsController @Author zhang @Date 2023/7/6 18:30 */
+@RequestMapping("/seatunnel/api/v1/job/metrics")
+@RestController
+public class JobMetricsController {
+
+ @Resource private IJobMetricsService jobMetricsService;
+
+ @GetMapping("/detail")
+ @ApiOperation(value = "get the job pipeline detail metrics", httpMethod = "GET")
+ public Result<List<JobPipelineDetailMetricsRes>> detail(
+ @ApiParam(value = "userId", required = true) @RequestAttribute Integer userId,
+ @ApiParam(value = "jobInstanceId", required = true) @RequestParam Long jobInstanceId)
+ throws IOException {
+
+ return Result.success(
+ jobMetricsService.getJobPipelineDetailMetricsRes(userId, jobInstanceId));
+ }
+
+ @GetMapping("/dag")
+ @ApiOperation(value = "get the job pipeline dag", httpMethod = "GET")
+ public Result<JobDAG> getJobDAG(
+ @ApiParam(value = "userId", required = true) @RequestAttribute Integer userId,
+ @ApiParam(value = "jobInstanceId", required = true) @RequestParam Long jobInstanceId)
+ throws JsonProcessingException {
+
+ return Result.success(jobMetricsService.getJobDAG(userId, jobInstanceId));
+ }
+
+ @GetMapping("/summary")
+ @ApiOperation(value = "get the job pipeline summary metrics", httpMethod = "GET")
+ public Result<List<JobPipelineSummaryMetricsRes>> summary(
+ @ApiParam(value = "userId", required = true) @RequestAttribute Integer userId,
+ @ApiParam(value = "jobInstanceId", required = true) @RequestParam Long jobInstanceId)
+ throws IOException {
+ return Result.success(
+ jobMetricsService.getJobPipelineSummaryMetrics(userId, jobInstanceId));
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ScriptController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ScriptController.java
index bf22b5a5..9b43f443 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ScriptController.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ScriptController.java
@@ -1,155 +1,155 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.app.controller;
-
-import org.apache.seatunnel.app.aspect.UserId;
-import org.apache.seatunnel.app.common.Result;
-import org.apache.seatunnel.app.domain.request.script.CreateScriptReq;
-import org.apache.seatunnel.app.domain.request.script.PublishScriptReq;
-import org.apache.seatunnel.app.domain.request.script.ScriptListReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptContentReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptParamReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.script.CreateScriptRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptFullInfoRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptParamRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptSimpleInfoRes;
-import org.apache.seatunnel.app.service.IScriptService;
-
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
-
-import java.util.List;
-
-@RequestMapping("/seatunnel/api/v1/script")
-@RestController
-public class ScriptController {
- @Resource private IScriptService iScriptService;
-
- @PostMapping
- @ApiOperation(value = "add an script with content", httpMethod = "POST")
- public Result<CreateScriptRes> createScript(
- @RequestBody @NotNull CreateScriptReq createScriptReq,
- @ApiIgnore @UserId Integer operatorId) {
- createScriptReq.setCreatorId(operatorId);
- return Result.success(iScriptService.createScript(createScriptReq));
- }
-
- @PutMapping("/{scriptId}/content")
- @ApiOperation(value = "update script", httpMethod = "PUT")
- public Result<Void> updateScriptContent(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId,
- @RequestBody @NotNull UpdateScriptContentReq req,
- @ApiIgnore @UserId Integer operatorId) {
- req.setScriptId(scriptId);
- req.setMenderId(operatorId);
-
- iScriptService.updateScriptContent(req);
- return Result.success();
- }
-
- @DeleteMapping("/{scriptId}")
- @ApiOperation(value = "delete script", httpMethod = "DELETE")
- public Result<Void> delete(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId) {
- iScriptService.delete(scriptId);
- return Result.success();
- }
-
- @GetMapping
- @ApiOperation(value = "script list", httpMethod = "GET")
- public Result<PageInfo<ScriptSimpleInfoRes>> list(
- @ApiParam(value = "script name") @RequestParam(required = false) String name,
- @ApiParam(value = "script status") @RequestParam(required = false) Byte status,
- @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
- @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
-
- final ScriptListReq req = new ScriptListReq();
- req.setName(name);
- req.setPageNo(pageNo);
- req.setPageSize(pageSize);
-
- return Result.success(iScriptService.list(req));
- }
-
- @GetMapping("/{scriptId}/content")
- @ApiOperation(value = "fetch script content", httpMethod = "GET")
- public Result<String> fetchScriptContent(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId) {
- return Result.success(iScriptService.fetchScriptContent(scriptId));
- }
-
- @GetMapping("/{scriptId}")
- public Result<ScriptFullInfoRes> detail(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId) {
- return Result.success(iScriptService.detail(scriptId));
- }
-
- @PutMapping("/{scriptId}/param")
- @ApiOperation(value = "update script param", httpMethod = "PUT")
- public Result<Void> updateScriptParam(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId,
- @RequestBody @NotNull UpdateScriptParamReq updateScriptParamReq) {
- updateScriptParamReq.setScriptId(scriptId);
- iScriptService.updateScriptParam(updateScriptParamReq);
- return Result.success();
- }
-
- @GetMapping("/{scriptId}/param")
- @ApiOperation(value = "fetch script param", httpMethod = "GET")
- public Result<List<ScriptParamRes>> fetchScriptParam(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId) {
- return Result.success(iScriptService.fetchScriptParam(scriptId));
- }
-
- @PatchMapping("/{scriptId}/publish")
- @ApiOperation(value = "publish script", httpMethod = "PATCH")
- public Result<Void> publish(
- @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
- Integer scriptId,
- @ApiIgnore @UserId Integer operatorId) {
-
- final PublishScriptReq req = new PublishScriptReq();
- req.setScriptId(scriptId);
- req.setOperatorId(operatorId);
-
- iScriptService.publishScript(req);
- return Result.success();
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.app.controller;
+//
+// import org.apache.seatunnel.app.aspect.UserId;
+// import org.apache.seatunnel.app.common.Result;
+// import org.apache.seatunnel.app.domain.request.script.CreateScriptReq;
+// import org.apache.seatunnel.app.domain.request.script.PublishScriptReq;
+// import org.apache.seatunnel.app.domain.request.script.ScriptListReq;
+// import org.apache.seatunnel.app.domain.request.script.UpdateScriptContentReq;
+// import org.apache.seatunnel.app.domain.request.script.UpdateScriptParamReq;
+// import org.apache.seatunnel.app.domain.response.PageInfo;
+// import org.apache.seatunnel.app.domain.response.script.CreateScriptRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptFullInfoRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptParamRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptSimpleInfoRes;
+// import org.apache.seatunnel.app.service.IScriptService;
+//
+// import org.springframework.web.bind.annotation.DeleteMapping;
+// import org.springframework.web.bind.annotation.GetMapping;
+// import org.springframework.web.bind.annotation.PatchMapping;
+// import org.springframework.web.bind.annotation.PathVariable;
+// import org.springframework.web.bind.annotation.PostMapping;
+// import org.springframework.web.bind.annotation.PutMapping;
+// import org.springframework.web.bind.annotation.RequestBody;
+// import org.springframework.web.bind.annotation.RequestMapping;
+// import org.springframework.web.bind.annotation.RequestParam;
+// import org.springframework.web.bind.annotation.RestController;
+//
+// import io.swagger.annotations.ApiOperation;
+// import io.swagger.annotations.ApiParam;
+// import springfox.documentation.annotations.ApiIgnore;
+//
+// import javax.annotation.Resource;
+// import javax.validation.constraints.NotNull;
+//
+// import java.util.List;
+//
+// @RequestMapping("/seatunnel/api/v1/script")
+// @RestController
+// public class ScriptController {
+// @Resource private IScriptService iScriptService;
+//
+// @PostMapping
+// @ApiOperation(value = "add an script with content", httpMethod = "POST")
+// public Result<CreateScriptRes> createScript(
+// @RequestBody @NotNull CreateScriptReq createScriptReq,
+// @ApiIgnore @UserId Integer operatorId) {
+// createScriptReq.setCreatorId(operatorId);
+// return Result.success(iScriptService.createScript(createScriptReq));
+// }
+//
+// @PutMapping("/{scriptId}/content")
+// @ApiOperation(value = "update script", httpMethod = "PUT")
+// public Result<Void> updateScriptContent(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId,
+// @RequestBody @NotNull UpdateScriptContentReq req,
+// @ApiIgnore @UserId Integer operatorId) {
+// req.setScriptId(scriptId);
+// req.setMenderId(operatorId);
+//
+// iScriptService.updateScriptContent(req);
+// return Result.success();
+// }
+//
+// @DeleteMapping("/{scriptId}")
+// @ApiOperation(value = "delete script", httpMethod = "DELETE")
+// public Result<Void> delete(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId) {
+// iScriptService.delete(scriptId);
+// return Result.success();
+// }
+//
+// @GetMapping
+// @ApiOperation(value = "script list", httpMethod = "GET")
+// public Result<PageInfo<ScriptSimpleInfoRes>> list(
+// @ApiParam(value = "script name") @RequestParam(required = false) String name,
+// @ApiParam(value = "script status") @RequestParam(required = false) Byte status,
+// @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
+// @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
+//
+// final ScriptListReq req = new ScriptListReq();
+// req.setName(name);
+// req.setPageNo(pageNo);
+// req.setPageSize(pageSize);
+//
+// return Result.success(iScriptService.list(req));
+// }
+//
+// @GetMapping("/{scriptId}/content")
+// @ApiOperation(value = "fetch script content", httpMethod = "GET")
+// public Result<String> fetchScriptContent(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId) {
+// return Result.success(iScriptService.fetchScriptContent(scriptId));
+// }
+//
+// @GetMapping("/{scriptId}")
+// public Result<ScriptFullInfoRes> detail(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId) {
+// return Result.success(iScriptService.detail(scriptId));
+// }
+//
+// @PutMapping("/{scriptId}/param")
+// @ApiOperation(value = "update script param", httpMethod = "PUT")
+// public Result<Void> updateScriptParam(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId,
+// @RequestBody @NotNull UpdateScriptParamReq updateScriptParamReq) {
+// updateScriptParamReq.setScriptId(scriptId);
+// iScriptService.updateScriptParam(updateScriptParamReq);
+// return Result.success();
+// }
+//
+// @GetMapping("/{scriptId}/param")
+// @ApiOperation(value = "fetch script param", httpMethod = "GET")
+// public Result<List<ScriptParamRes>> fetchScriptParam(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId) {
+// return Result.success(iScriptService.fetchScriptParam(scriptId));
+// }
+//
+// @PatchMapping("/{scriptId}/publish")
+// @ApiOperation(value = "publish script", httpMethod = "PATCH")
+// public Result<Void> publish(
+// @ApiParam(value = "script id", required = true) @PathVariable(value = "scriptId")
+// Integer scriptId,
+// @ApiIgnore @UserId Integer operatorId) {
+//
+// final PublishScriptReq req = new PublishScriptReq();
+// req.setScriptId(scriptId);
+// req.setOperatorId(operatorId);
+//
+// iScriptService.publishScript(req);
+// return Result.success();
+// }
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskController.java
index 7fc63526..716cd995 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskController.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskController.java
@@ -1,127 +1,128 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.app.controller;
-
-import org.apache.seatunnel.app.aspect.UserId;
-import org.apache.seatunnel.app.common.Result;
-import org.apache.seatunnel.app.domain.request.task.ExecuteReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceListReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceLogRes;
-import org.apache.seatunnel.app.domain.request.task.JobListReq;
-import org.apache.seatunnel.app.domain.request.task.RecycleScriptReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.task.InstanceSimpleInfoRes;
-import org.apache.seatunnel.app.domain.response.task.JobSimpleInfoRes;
-import org.apache.seatunnel.app.service.ITaskService;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
-
-@RequestMapping("/seatunnel/api/v1/task")
-@RestController
-public class TaskController {
-
- @Resource private ITaskService iTaskService;
-
- @PatchMapping("/{jobId}/recycle")
- @ApiOperation(value = "recycle job", httpMethod = "PATCH")
- Result<Void> recycle(
- @ApiParam(value = "job id", required = true) @PathVariable(value = "jobId") Long jobId,
- @ApiIgnore @UserId Integer operatorId) {
- final RecycleScriptReq req = new RecycleScriptReq();
- req.setJobId(jobId);
- req.setOperatorId(operatorId);
-
- iTaskService.recycleScriptFromScheduler(req);
- return Result.success();
- }
-
- @GetMapping("/job")
- @ApiOperation(value = "list job", httpMethod = "GET")
- Result<PageInfo<JobSimpleInfoRes>> listJob(
- @ApiParam(value = "job name") @RequestParam(required = false) String name,
- @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
- @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
- final JobListReq req = new JobListReq();
- req.setName(name);
- req.setPageNo(pageNo);
- req.setPageSize(pageSize);
-
- return Result.success(iTaskService.listJob(req));
- }
-
- @GetMapping("/instance")
- @ApiOperation(value = "list instance", httpMethod = "GET")
- Result<PageInfo<InstanceSimpleInfoRes>> listInstance(
- @ApiParam(value = "job name", required = false) @RequestParam(required = false)
- String name,
- @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
- @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
- final InstanceListReq req = new InstanceListReq();
- req.setName(name);
- req.setPageNo(pageNo);
- req.setPageSize(pageSize);
-
- return Result.success(iTaskService.listInstance(req));
- }
-
- @PostMapping("/{objectId}/execute")
- @ApiOperation(value = "execute script temporary", httpMethod = "POST")
- Result<InstanceSimpleInfoRes> tmpExecute(
- @ApiParam(value = "object id", required = true) @PathVariable(value = "objectId")
- Long objectId,
- @RequestBody @NotNull ExecuteReq req,
- @ApiIgnore @UserId Integer operatorId) {
- req.setObjectId(objectId);
- req.setOperatorId(operatorId);
-
- return Result.success(iTaskService.tmpExecute(req));
- }
-
- @GetMapping("/{taskInstanceId}")
- @ApiOperation(value = "query instance log", httpMethod = "GET")
- Result<InstanceLogRes> queryInstanceLog(
- @ApiParam(value = "task instance id", required = true)
- @PathVariable(value = "taskInstanceId")
- Long taskInstanceId) {
- return Result.success(iTaskService.queryInstanceLog(taskInstanceId));
- }
-
- @PatchMapping("/{taskInstanceId}")
- @ApiOperation(value = "kill running instance", httpMethod = "POST")
- Result<Void> kill(
- @ApiParam(value = "task instance id", required = true)
- @PathVariable(value = "taskInstanceId")
- Long taskInstanceId) {
- iTaskService.kill(taskInstanceId);
- return Result.success();
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.app.controller;
+//
+// import org.apache.seatunnel.app.aspect.UserId;
+// import org.apache.seatunnel.app.common.Result;
+// import org.apache.seatunnel.app.domain.request.task.ExecuteReq;
+// import org.apache.seatunnel.app.domain.request.task.InstanceListReq;
+// import org.apache.seatunnel.app.domain.request.task.InstanceLogRes;
+// import org.apache.seatunnel.app.domain.request.task.JobListReq;
+// import org.apache.seatunnel.app.domain.request.task.RecycleScriptReq;
+// import org.apache.seatunnel.app.domain.response.PageInfo;
+// import org.apache.seatunnel.app.domain.response.task.InstanceSimpleInfoRes;
+// import org.apache.seatunnel.app.domain.response.task.JobSimpleInfoRes;
+// import org.apache.seatunnel.app.service.ITaskService;
+//
+// import org.springframework.web.bind.annotation.GetMapping;
+// import org.springframework.web.bind.annotation.PatchMapping;
+// import org.springframework.web.bind.annotation.PathVariable;
+// import org.springframework.web.bind.annotation.PostMapping;
+// import org.springframework.web.bind.annotation.RequestBody;
+// import org.springframework.web.bind.annotation.RequestMapping;
+// import org.springframework.web.bind.annotation.RequestParam;
+// import org.springframework.web.bind.annotation.RestController;
+//
+// import io.swagger.annotations.ApiOperation;
+// import io.swagger.annotations.ApiParam;
+// import springfox.documentation.annotations.ApiIgnore;
+//
+// import javax.annotation.Resource;
+// import javax.validation.constraints.NotNull;
+//
+// @RequestMapping("/seatunnel/api/v1/task")
+// @RestController
+// public class TaskController {
+//
+// @Resource private ITaskService iTaskService;
+//
+// @PatchMapping("/{jobId}/recycle")
+// @ApiOperation(value = "recycle job", httpMethod = "PATCH")
+// Result<Void> recycle(
+// @ApiParam(value = "job id", required = true) @PathVariable(value = "jobId") Long
+// jobId,
+// @ApiIgnore @UserId Integer operatorId) {
+// final RecycleScriptReq req = new RecycleScriptReq();
+// req.setJobId(jobId);
+// req.setOperatorId(operatorId);
+//
+// iTaskService.recycleScriptFromScheduler(req);
+// return Result.success();
+// }
+//
+// @GetMapping("/job")
+// @ApiOperation(value = "list job", httpMethod = "GET")
+// Result<PageInfo<JobSimpleInfoRes>> listJob(
+// @ApiParam(value = "job name") @RequestParam(required = false) String name,
+// @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
+// @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
+// final JobListReq req = new JobListReq();
+// req.setName(name);
+// req.setPageNo(pageNo);
+// req.setPageSize(pageSize);
+//
+// return Result.success(iTaskService.listJob(req));
+// }
+//
+// @GetMapping("/instance")
+// @ApiOperation(value = "list instance", httpMethod = "GET")
+// Result<PageInfo<InstanceSimpleInfoRes>> listInstance(
+// @ApiParam(value = "job name", required = false) @RequestParam(required = false)
+// String name,
+// @ApiParam(value = "page num", required = true) @RequestParam Integer pageNo,
+// @ApiParam(value = "page size", required = true) @RequestParam Integer pageSize) {
+// final InstanceListReq req = new InstanceListReq();
+// req.setName(name);
+// req.setPageNo(pageNo);
+// req.setPageSize(pageSize);
+//
+// return Result.success(iTaskService.listInstance(req));
+// }
+//
+// @PostMapping("/{objectId}/execute")
+// @ApiOperation(value = "execute script temporary", httpMethod = "POST")
+// Result<InstanceSimpleInfoRes> tmpExecute(
+// @ApiParam(value = "object id", required = true) @PathVariable(value = "objectId")
+// Long objectId,
+// @RequestBody @NotNull ExecuteReq req,
+// @ApiIgnore @UserId Integer operatorId) {
+// req.setObjectId(objectId);
+// req.setOperatorId(operatorId);
+//
+// return Result.success(iTaskService.tmpExecute(req));
+// }
+//
+// @GetMapping("/{taskInstanceId}")
+// @ApiOperation(value = "query instance log", httpMethod = "GET")
+// Result<InstanceLogRes> queryInstanceLog(
+// @ApiParam(value = "task instance id", required = true)
+// @PathVariable(value = "taskInstanceId")
+// Long taskInstanceId) {
+// return Result.success(iTaskService.queryInstanceLog(taskInstanceId));
+// }
+//
+// @PatchMapping("/{taskInstanceId}")
+// @ApiOperation(value = "kill running instance", httpMethod = "POST")
+// Result<Void> kill(
+// @ApiParam(value = "task instance id", required = true)
+// @PathVariable(value = "taskInstanceId")
+// Long taskInstanceId) {
+// iTaskService.kill(taskInstanceId);
+// return Result.success();
+// }
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java
new file mode 100644
index 00000000..b585b5d6
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java
@@ -0,0 +1,50 @@
+package org.apache.seatunnel.app.controller;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
+import org.apache.seatunnel.app.domain.response.PageInfo;
+import org.apache.seatunnel.app.service.ITaskInstanceService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+/** @Description @ClassName TaskInstance @Author zhang @Date 2023/7/4 11:35 */
+@RequestMapping("/seatunnel/api/v1/task")
+@RestController
+public class TaskInstanceController {
+
+ @Autowired ITaskInstanceService taskInstanceService;
+
+ @GetMapping("/jobMetrics")
+ @ApiOperation(value = "get the jobMetrics list ", httpMethod = "GET")
+ public Result<PageInfo<SeaTunnelJobInstanceDto>> getTaskInstanceList(
+ @RequestAttribute(name = "userId") Integer userId,
+ @RequestParam(name = "jobDefineName", required = false) String jobDefineName,
+ @RequestParam(name = "executorName", required = false) String executorName,
+ @RequestParam(name = "stateType", required = false) String stateType,
+ @RequestParam(name = "startDate", required = false) String startTime,
+ @RequestParam(name = "endDate", required = false) String endTime,
+ @RequestParam("syncTaskType") String syncTaskType,
+ @RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize) {
+ Result<PageInfo<SeaTunnelJobInstanceDto>> result =
+ taskInstanceService.getSyncTaskInstancePaging(
+ userId,
+ jobDefineName,
+ executorName,
+ stateType,
+ startTime,
+ endTime,
+ syncTaskType,
+ pageNo,
+ pageSize);
+
+ return result;
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobDefinitionDao.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobDefinitionDao.java
index 51b29ee2..647936a4 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobDefinitionDao.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobDefinitionDao.java
@@ -34,7 +34,9 @@ public interface IJobDefinitionDao {
PageInfo<JobDefinition> getJob(String name, Integer pageNo, Integer pageSize, String jobMode);
- List<JobDefinition> getJob(@NonNull String name);
+ List<JobDefinition> getJobList(@NonNull String name);
+
+ JobDefinition getJobByName(@NonNull String name);
void delete(long id);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
index c9d9c165..f4c5b8f1 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceDao.java
@@ -19,9 +19,14 @@ package org.apache.seatunnel.app.dal.dao;
import org.apache.seatunnel.app.dal.entity.JobInstance;
import org.apache.seatunnel.app.dal.mapper.JobInstanceMapper;
+import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.NonNull;
+import java.util.Date;
+import java.util.List;
+
public interface IJobInstanceDao {
JobInstance getJobInstance(@NonNull Long jobInstanceId);
@@ -33,4 +38,13 @@ public interface IJobInstanceDao {
void insert(@NonNull JobInstance jobInstance);
JobInstanceMapper getJobInstanceMapper();
+
+ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
+ IPage<JobInstance> page,
+ Date startTime,
+ Date endTime,
+ Long jobDefineId,
+ String jobMode);
+
+ List<JobInstance> getAllJobInstance(@NonNull List<Long> jobInstanceIdList);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceHistoryDao.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceHistoryDao.java
index 9f976de4..9136c592 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceHistoryDao.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobInstanceHistoryDao.java
@@ -20,7 +20,7 @@ package org.apache.seatunnel.app.dal.dao;
import org.apache.seatunnel.app.dal.entity.JobInstanceHistory;
public interface IJobInstanceHistoryDao {
- JobInstanceHistory getByInstanceId(Long jobInstanceId, Long projectCode);
+ JobInstanceHistory getByInstanceId(Long jobInstanceId);
void insert(JobInstanceHistory jobInstanceHistory);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobMetricsDao.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobMetricsDao.java
index 9578ece4..d5970463 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobMetricsDao.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/IJobMetricsDao.java
@@ -25,7 +25,7 @@ import java.util.List;
public interface IJobMetricsDao {
- List<JobMetrics> getByInstanceId(@NonNull Long projectCode, @NonNull Long jobInstanceId);
+ List<JobMetrics> getByInstanceId(@NonNull Long jobInstanceId);
JobMetricsMapper getJobMetricsMapper();
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobDefinitionDaoImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobDefinitionDaoImpl.java
index 3d45edaf..2d010cc8 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobDefinitionDaoImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobDefinitionDaoImpl.java
@@ -76,10 +76,15 @@ public class JobDefinitionDaoImpl implements IJobDefinitionDao {
}
@Override
- public List<JobDefinition> getJob(@NonNull String name) {
+ public List<JobDefinition> getJobList(@NonNull String name) {
return jobMapper.queryJobList(name);
}
+ @Override
+ public JobDefinition getJobByName(@NonNull String name) {
+ return jobMapper.queryJob(name);
+ }
+
public void delete(long id) {
jobMapper.delete(
Wrappers.lambdaQuery(new JobDefinition()).and(i -> i.eq(JobDefinition::getId, id)));
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
index ce23e7ef..4eff1e18 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java
@@ -20,14 +20,20 @@ package org.apache.seatunnel.app.dal.dao.impl;
import org.apache.seatunnel.app.dal.dao.IJobInstanceDao;
import org.apache.seatunnel.app.dal.entity.JobInstance;
import org.apache.seatunnel.app.dal.mapper.JobInstanceMapper;
+import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.NonNull;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
@Repository
public class JobInstanceDaoImpl implements IJobInstanceDao {
@Resource private JobInstanceMapper jobInstanceMapper;
@@ -58,4 +64,28 @@ public class JobInstanceDaoImpl implements IJobInstanceDao {
public JobInstanceMapper getJobInstanceMapper() {
return jobInstanceMapper;
}
+
+ @Override
+ public IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
+ IPage<JobInstance> page,
+ Date startTime,
+ Date endTime,
+ Long jobDefineId,
+ String jobMode) {
+ IPage<SeaTunnelJobInstanceDto> jobInstanceIPage =
+ jobInstanceMapper.queryJobInstanceListPaging(
+ page, startTime, endTime, jobDefineId, jobMode);
+ return jobInstanceIPage;
+ }
+
+ @Override
+ public List<JobInstance> getAllJobInstance(@NonNull List<Long> jobInstanceIdList) {
+ ArrayList<JobInstance> jobInstances = new ArrayList<>();
+ for (long jobInstanceId : jobInstanceIdList) {
+ JobInstance jobInstance = jobInstanceMapper.selectById(jobInstanceId);
+ jobInstances.add(jobInstance);
+ }
+
+ return jobInstances;
+ }
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceHistoryDaoImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceHistoryDaoImpl.java
index 40099f5e..3655b021 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceHistoryDaoImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceHistoryDaoImpl.java
@@ -33,7 +33,7 @@ public class JobInstanceHistoryDaoImpl implements IJobInstanceHistoryDao {
@Resource private JobInstanceHistoryMapper jobInstanceHistoryMapper;
@Override
- public JobInstanceHistory getByInstanceId(Long jobInstanceId, Long projectCode) {
+ public JobInstanceHistory getByInstanceId(Long jobInstanceId) {
return jobInstanceHistoryMapper.selectOne(
Wrappers.lambdaQuery(new JobInstanceHistory())
.eq(JobInstanceHistory::getId, jobInstanceId));
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobMetricsDaoImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobMetricsDaoImpl.java
index 0428c26d..11cc40e0 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobMetricsDaoImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobMetricsDaoImpl.java
@@ -34,9 +34,8 @@ public class JobMetricsDaoImpl implements IJobMetricsDao {
@Resource private JobMetricsMapper jobMetricsMapper;
@Override
- public List<JobMetrics> getByInstanceId(
- @NonNull Long projectCode, @NonNull Long jobInstanceId) {
- return jobMetricsMapper.queryJobMetricsByInstanceId(projectCode, jobInstanceId);
+ public List<JobMetrics> getByInstanceId(@NonNull Long jobInstanceId) {
+ return jobMetricsMapper.queryJobMetricsByInstanceId(jobInstanceId);
}
@Override
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/entity/JobInstance.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/entity/JobInstance.java
index 63419a9b..edcb2f7e 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/entity/JobInstance.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/entity/JobInstance.java
@@ -67,4 +67,10 @@ public class JobInstance {
@TableField("update_time")
private Date updateTime;
+
+ @TableField("end_time")
+ private Date endTime;
+
+ @TableField("job_type")
+ private String jobType;
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
index 266cc1f4..1ad784df 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.java
@@ -18,7 +18,23 @@
package org.apache.seatunnel.app.dal.mapper;
import org.apache.seatunnel.app.dal.entity.JobInstance;
+import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
+
+import org.apache.ibatis.annotations.Param;
+
+import org.mapstruct.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
-public interface JobInstanceMapper extends BaseMapper<JobInstance> {}
+@Mapper
+public interface JobInstanceMapper extends BaseMapper<JobInstance> {
+ IPage<SeaTunnelJobInstanceDto> queryJobInstanceListPaging(
+ IPage<JobInstance> page,
+ @Param("startTime") Date startTime,
+ @Param("endTime") Date endTime,
+ @Param("jobDefineId") Long jobDefineId,
+ @Param("jobMode") String jobMode);
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMapper.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMapper.java
index b4021283..4b07620b 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMapper.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMapper.java
@@ -37,4 +37,6 @@ public interface JobMapper extends BaseMapper<JobDefinition> {
@Param("jobMode") String jobMode);
List<JobDefinition> queryJobList(@Param("searchName") String searchName);
+
+ JobDefinition queryJob(@Param("searchName") String searchName);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMetricsMapper.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMetricsMapper.java
index f33cd46b..1671c933 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMetricsMapper.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/mapper/JobMetricsMapper.java
@@ -25,8 +25,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
public interface JobMetricsMapper extends BaseMapper<JobMetrics> {
- List<JobMetrics> queryJobMetricsByInstanceId(
- @Param("projectCode") Long projectCode, @Param("jobInstanceId") Long jobInstanceId);
+ List<JobMetrics> queryJobMetricsByInstanceId(@Param("jobInstanceId") Long jobInstanceId);
void insertBatchMetrics(@Param("jobMetrics") List<JobMetrics> jobMetrics);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/dto/job/SeaTunnelJobInstanceDto.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/dto/job/SeaTunnelJobInstanceDto.java
new file mode 100644
index 00000000..e5664938
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/dto/job/SeaTunnelJobInstanceDto.java
@@ -0,0 +1,17 @@
+package org.apache.seatunnel.app.domain.dto.job;
+
+import org.apache.seatunnel.app.dal.entity.JobInstance;
+
+import lombok.Data;
+
+/** @Description @ClassName SeaTunnelJobInstanceDto @Author zhang @Date 2023/7/4 11:19 */
+@Data
+public class SeaTunnelJobInstanceDto extends JobInstance {
+ private String jobDefineName;
+
+ private long readRowCount;
+
+ private long writeRowCount;
+
+ private Long runningTime;
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/PageInfo.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/PageInfo.java
index e9c70cfe..5b5d6447 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/PageInfo.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/PageInfo.java
@@ -30,6 +30,19 @@ public class PageInfo<T> {
private Integer totalPage = 0;
private Integer pageNo = 1;
private Integer pageSize = 20;
+ /** current page */
+ private Integer currentPage = 0;
+
+ public PageInfo() {};
+
+ public PageInfo(Integer currentPage, Integer pageSize) {
+ if (currentPage == null) {
+ currentPage = 1;
+ }
+ this.pageNo = (currentPage - 1) * pageSize;
+ this.pageSize = pageSize;
+ this.currentPage = currentPage;
+ }
public List<T> getData() {
return data;
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/executor/JobExecutorRes.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/executor/JobExecutorRes.java
index a20cd9f8..9e61a63a 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/executor/JobExecutorRes.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/domain/response/executor/JobExecutorRes.java
@@ -36,4 +36,6 @@ public class JobExecutorRes {
/** The engine run mode, for SeaTunnel Engine only support 'local' and null */
private final String master;
+
+ private final String jobMode;
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/BaseService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/BaseService.java
new file mode 100644
index 00000000..2a20c09d
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/BaseService.java
@@ -0,0 +1,9 @@
+package org.apache.seatunnel.app.service;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.common.Status;
+
+public interface BaseService {
+
+ void putMsg(Result result, Status status, Object... statusParams);
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobExecutorService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobExecutorService.java
new file mode 100644
index 00000000..3f405492
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobExecutorService.java
@@ -0,0 +1,12 @@
+package org.apache.seatunnel.app.service;
+
+import org.apache.seatunnel.app.common.Result;
+
+public interface IJobExecutorService {
+
+ public Result jobExecute(Integer userId, Long jobDefineId);
+
+ public Result jobPause(Integer userId, Long jobInstanceId);
+
+ public Result jobStore(Integer userId, Long jobInstanceId);
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobInstanceService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobInstanceService.java
index a6686e72..1b985777 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobInstanceService.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobInstanceService.java
@@ -26,16 +26,12 @@ import lombok.NonNull;
import java.util.List;
public interface IJobInstanceService {
- JobExecutorRes createExecuteResource(
- @NonNull Integer userId, @NonNull Long projectCode, @NonNull Long jobDefineId);
+ JobExecutorRes createExecuteResource(@NonNull Integer userId, @NonNull Long jobDefineId);
String generateJobConfig(Long jobId, List<JobTask> tasks, List<JobLine> lines, String envStr);
JobExecutorRes getExecuteResource(@NonNull Long jobEngineId);
void complete(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId);
+ @NonNull Integer userId, @NonNull Long jobInstanceId, @NonNull String jobEngineId);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobMetricsService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobMetricsService.java
index 17f6e722..95a12157 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobMetricsService.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IJobMetricsService.java
@@ -29,39 +29,30 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.NonNull;
import java.util.List;
+import java.util.Map;
public interface IJobMetricsService {
List<JobPipelineSummaryMetricsRes> getJobPipelineSummaryMetrics(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId);
+ @NonNull Integer userId, @NonNull Long jobInstanceId);
List<JobPipelineDetailMetricsRes> getJobPipelineDetailMetricsRes(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId);
+ @NonNull Integer userId, @NonNull Long jobInstanceId);
- JobDAG getJobDAG(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId)
+ JobDAG getJobDAG(@NonNull Integer userId, @NonNull Long jobInstanceId)
throws JsonProcessingException;
ImmutablePair<Long, String> getInstanceIdAndEngineId(@NonNull String key);
void syncJobDataToDb(
- @NonNull JobInstance jobInstance,
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull String jobEngineId);
+ @NonNull JobInstance jobInstance, @NonNull Integer userId, @NonNull String jobEngineId);
JobSummaryMetricsRes getJobSummaryMetrics(
+ @NonNull Integer userId, @NonNull Long jobInstanceId, @NonNull String jobEngineId);
+
+ Map<Long, JobSummaryMetricsRes> getALLJobSummaryMetrics(
@NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId);
+ @NonNull Map<Long, Long> jobInstanceIdAndJobEngineIdMap,
+ @NonNull List<Long> jobInstanceIdList,
+ @NonNull String syncTaskType);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IScriptService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IScriptService.java
index ad061cbe..9c7573ed 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IScriptService.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/IScriptService.java
@@ -17,35 +17,22 @@
package org.apache.seatunnel.app.service;
-import org.apache.seatunnel.app.domain.request.script.CreateScriptReq;
-import org.apache.seatunnel.app.domain.request.script.PublishScriptReq;
-import org.apache.seatunnel.app.domain.request.script.ScriptListReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptContentReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptParamReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.script.CreateScriptRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptFullInfoRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptParamRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptSimpleInfoRes;
-
-import java.util.List;
-
-public interface IScriptService {
- CreateScriptRes createScript(CreateScriptReq createScriptReq);
-
- void updateScriptContent(UpdateScriptContentReq updateScriptContentReq);
-
- void delete(Integer id);
-
- PageInfo<ScriptSimpleInfoRes> list(ScriptListReq scriptListReq);
-
- String fetchScriptContent(Integer id);
-
- List<ScriptParamRes> fetchScriptParam(Integer id);
-
- void updateScriptParam(UpdateScriptParamReq updateScriptParamReq);
-
- void publishScript(PublishScriptReq req);
-
- ScriptFullInfoRes detail(Integer scriptId);
-}
+// public interface IScriptService {
+// CreateScriptRes createScript(CreateScriptReq createScriptReq);
+//
+// void updateScriptContent(UpdateScriptContentReq updateScriptContentReq);
+//
+// void delete(Integer id);
+//
+// PageInfo<ScriptSimpleInfoRes> list(ScriptListReq scriptListReq);
+//
+// String fetchScriptContent(Integer id);
+//
+// List<ScriptParamRes> fetchScriptParam(Integer id);
+//
+// void updateScriptParam(UpdateScriptParamReq updateScriptParamReq);
+//
+// void publishScript(PublishScriptReq req);
+//
+// ScriptFullInfoRes detail(Integer scriptId);
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskInstanceService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskInstanceService.java
new file mode 100644
index 00000000..cb1b9c9a
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskInstanceService.java
@@ -0,0 +1,17 @@
+package org.apache.seatunnel.app.service;
+
+import org.apache.seatunnel.app.common.Result;
+
+public interface ITaskInstanceService {
+
+ Result getSyncTaskInstancePaging(
+ Integer userId,
+ String jobDefineName,
+ String executorName,
+ String stateType,
+ String startTime,
+ String endTime,
+ String syncTaskType,
+ Integer pageNo,
+ Integer pageSize);
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskService.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskService.java
index a197f1e7..a6453c67 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskService.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/ITaskService.java
@@ -17,28 +17,18 @@
package org.apache.seatunnel.app.service;
-import org.apache.seatunnel.app.domain.dto.job.PushScriptDto;
-import org.apache.seatunnel.app.domain.request.task.ExecuteReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceListReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceLogRes;
-import org.apache.seatunnel.app.domain.request.task.JobListReq;
-import org.apache.seatunnel.app.domain.request.task.RecycleScriptReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.task.InstanceSimpleInfoRes;
-import org.apache.seatunnel.app.domain.response.task.JobSimpleInfoRes;
-
-public interface ITaskService {
- Long pushScriptToScheduler(PushScriptDto pushScriptDto);
-
- void recycleScriptFromScheduler(RecycleScriptReq req);
-
- PageInfo<JobSimpleInfoRes> listJob(JobListReq req);
-
- PageInfo<InstanceSimpleInfoRes> listInstance(InstanceListReq req);
-
- InstanceSimpleInfoRes tmpExecute(ExecuteReq req);
-
- InstanceLogRes queryInstanceLog(Long instanceId);
-
- void kill(Long instanceId);
-}
+// public interface ITaskService {
+// Long pushScriptToScheduler(PushScriptDto pushScriptDto);
+//
+// void recycleScriptFromScheduler(RecycleScriptReq req);
+//
+// PageInfo<JobSimpleInfoRes> listJob(JobListReq req);
+//
+// PageInfo<InstanceSimpleInfoRes> listInstance(InstanceListReq req);
+//
+// InstanceSimpleInfoRes tmpExecute(ExecuteReq req);
+//
+// InstanceLogRes queryInstanceLog(Long instanceId);
+//
+// void kill(Long instanceId);
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/BaseServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/BaseServiceImpl.java
new file mode 100644
index 00000000..d38ad854
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/BaseServiceImpl.java
@@ -0,0 +1,22 @@
+package org.apache.seatunnel.app.service.impl;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.common.Status;
+import org.apache.seatunnel.app.service.BaseService;
+
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+
+@Service
+public class BaseServiceImpl implements BaseService {
+ @Override
+ public void putMsg(Result result, Status status, Object... statusParams) {
+ result.setCode(status.getCode());
+ if (statusParams != null && statusParams.length > 0) {
+ result.setMsg(MessageFormat.format(status.getMsg(), statusParams));
+ } else {
+ result.setMsg(status.getMsg());
+ }
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobDefinitionServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobDefinitionServiceImpl.java
index abbb0b0e..c4ea7909 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobDefinitionServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobDefinitionServiceImpl.java
@@ -153,7 +153,7 @@ public class JobDefinitionServiceImpl extends SeatunnelBaseServiceImpl
public Map<Long, String> getJob(@NonNull String name) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_DEFINITION_VIEW, 0);
- List<JobDefinition> job = jobDefinitionDao.getJob(name);
+ List<JobDefinition> job = jobDefinitionDao.getJobList(name);
if (CollectionUtils.isEmpty(job)) {
return new HashMap<>();
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java
new file mode 100644
index 00000000..fe5ab5b9
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java
@@ -0,0 +1,207 @@
+package org.apache.seatunnel.app.service.impl;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.dal.dao.IJobInstanceDao;
+import org.apache.seatunnel.app.dal.entity.JobInstance;
+import org.apache.seatunnel.app.domain.response.engine.Engine;
+import org.apache.seatunnel.app.domain.response.executor.JobExecutorRes;
+import org.apache.seatunnel.app.service.IJobExecutorService;
+import org.apache.seatunnel.app.service.IJobInstanceService;
+import org.apache.seatunnel.app.thirdparty.engine.SeaTunnelEngineProxy;
+import org.apache.seatunnel.app.thirdparty.metrics.EngineMetricsExtractorFactory;
+import org.apache.seatunnel.app.thirdparty.metrics.IEngineMetricsExtractor;
+import org.apache.seatunnel.common.config.Common;
+import org.apache.seatunnel.common.config.DeployMode;
+import org.apache.seatunnel.engine.client.SeaTunnelClient;
+import org.apache.seatunnel.engine.client.job.ClientJobProxy;
+import org.apache.seatunnel.engine.client.job.JobExecutionEnvironment;
+import org.apache.seatunnel.engine.common.config.ConfigProvider;
+import org.apache.seatunnel.engine.common.config.JobConfig;
+import org.apache.seatunnel.engine.core.job.JobStatus;
+
+import org.springframework.stereotype.Service;
+
+import com.hazelcast.client.config.ClientConfig;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.annotation.Resource;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/** @Description @ClassName JobExecutorServiceImpl @Author zhang @Date 2023/6/30 15:53 */
+@Slf4j
+@Service
+public class JobExecutorServiceImpl implements IJobExecutorService {
+ @Resource private IJobInstanceService jobInstanceService;
+ @Resource private IJobInstanceDao jobInstanceDao;
+
+ @Override
+ public Result jobExecute(Integer userId, Long jobDefineId) {
+
+ // 先获取JobExecutorRes
+ JobExecutorRes executeResource =
+ jobInstanceService.createExecuteResource(userId, jobDefineId);
+ String jobConfig = executeResource.getJobConfig();
+
+ /** 将jobConfig写进conf文件中 */
+ String configFile = writeJobConfigIntoConfFile(jobConfig, jobDefineId);
+
+ /** 调用 */
+ Long jobInstanceId =
+ executeJobBySeaTunnel(userId, configFile, executeResource.getJobInstanceId());
+ return Result.success(jobInstanceId);
+ }
+
+ public String writeJobConfigIntoConfFile(String jobConfig, Long jobDefineId) {
+ String projectRoot = System.getProperty("user.dir");
+ String filePath = projectRoot + "\\profile\\" + Long.toString(jobDefineId) + ".conf";
+ try {
+ File file = new File(filePath);
+ if (!file.exists()) {
+ file.getParentFile().mkdirs(); // 创建文件所在的文件夹
+ }
+
+ FileWriter fileWriter = new FileWriter(file);
+ BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+
+ bufferedWriter.write(jobConfig);
+ bufferedWriter.close();
+
+ log.info("File created and content written successfully.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return filePath;
+ }
+
+ public Long executeJobBySeaTunnel(Integer userId, String filePath, Long jobInstanceId) {
+ Common.setDeployMode(DeployMode.CLIENT);
+ JobConfig jobConfig = new JobConfig();
+ jobConfig.setName(jobInstanceId + "_job");
+ SeaTunnelClient seaTunnelClient = createSeaTunnelClient();
+ try {
+ JobExecutionEnvironment jobExecutionEnv =
+ seaTunnelClient.createExecutionContext(filePath, jobConfig);
+ final ClientJobProxy clientJobProxy = jobExecutionEnv.execute();
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
+ jobInstance.setJobEngineId(Long.toString(clientJobProxy.getJobId()));
+ jobInstanceDao.update(jobInstance);
+
+ CompletableFuture.runAsync(
+ () -> {
+ waitJobFinish(
+ clientJobProxy,
+ userId,
+ jobInstanceId,
+ Long.toString(clientJobProxy.getJobId()),
+ seaTunnelClient);
+ });
+
+ // CompletableFuture<JobStatus> objectCompletableFuture =
+ // CompletableFuture.supplyAsync(
+ // () -> {
+ // return clientJobProxy.waitForJobComplete();
+ // });
+ //
+ // //异步测试任务执行是否成功
+ // await().atMost(180000, TimeUnit.MILLISECONDS)
+ // .untilAsserted(
+ // () ->
+ // Assertions.assertTrue(
+ // objectCompletableFuture.isDone()
+ // && JobStatus.FINISHED.equals(
+ // objectCompletableFuture.get())));
+
+ } catch (ExecutionException | InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ return jobInstanceId;
+ }
+
+ public void waitJobFinish(
+ ClientJobProxy clientJobProxy,
+ Integer userId,
+ Long jobInstanceId,
+ String jobEngineId,
+ SeaTunnelClient seaTunnelClient) {
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ CompletableFuture<JobStatus> future =
+ CompletableFuture.supplyAsync(
+ () -> {
+ // 执行耗时任务,返回结果
+ return clientJobProxy.waitForJobComplete();
+ },
+ executor);
+ try {
+ JobStatus jobStatus = future.get();
+ if (JobStatus.FINISHED.equals(jobStatus)) {
+ // 调用complete方法
+ jobInstanceService.complete(userId, jobInstanceId, jobEngineId);
+ executor.shutdown();
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ } finally {
+ seaTunnelClient.close();
+ }
+ }
+
+ private SeaTunnelClient createSeaTunnelClient() {
+ ClientConfig clientConfig = ConfigProvider.locateAndGetClientConfig();
+ clientConfig.setClusterName(getClusterName("seatunnel"));
+ return new SeaTunnelClient(clientConfig);
+ }
+
+ public static String getClusterName(String testClassName) {
+ // return System.getProperty("user.name") + "_" + testClassName;
+ return testClassName;
+ }
+
+ @Override
+ public Result jobPause(Integer userId, Long jobInstanceId) {
+ // 先检查引擎上该任务是不是正在执行
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
+ if (getJobStatusFromEngine(jobInstance, jobInstance.getJobEngineId()) == "RUNNING") {
+ // 暂停
+ pauseJobInEngine(jobInstance.getJobEngineId());
+ }
+ return Result.success();
+ }
+
+ private String getJobStatusFromEngine(@NonNull JobInstance jobInstance, String jobEngineId) {
+
+ Engine engine = new Engine(jobInstance.getEngineName(), jobInstance.getEngineVersion());
+
+ IEngineMetricsExtractor engineMetricsExtractor =
+ (new EngineMetricsExtractorFactory(engine)).getEngineMetricsExtractor();
+
+ return engineMetricsExtractor.getJobStatus(jobEngineId);
+ }
+
+ private void pauseJobInEngine(@NonNull String jobEngineId) {
+ SeaTunnelEngineProxy.getInstance().pauseJob(jobEngineId);
+ }
+
+ @Override
+ public Result jobStore(Integer userId, Long jobInstanceId) {
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
+
+ String projectRoot = System.getProperty("user.dir");
+ String filePath =
+ projectRoot + "\\profile\\" + Long.toString(jobInstance.getJobDefineId()) + ".conf";
+
+ SeaTunnelEngineProxy.getInstance()
+ .restoreJob(filePath, jobInstanceId, Long.valueOf(jobInstance.getJobEngineId()));
+ return Result.success();
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java
index 23db4ece..bb0df4a6 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java
@@ -125,12 +125,11 @@ public class JobInstanceServiceImpl extends SeatunnelBaseServiceImpl
@Override
public JobExecutorRes createExecuteResource(
- @NonNull Integer userId, @NonNull Long projectCode, @NonNull Long jobDefineId) {
+ @NonNull Integer userId, @NonNull Long jobDefineId) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_EXECUTOR_RESOURCE, userId);
log.info(
- "receive createExecuteResource request, userId:{}, projectCode:{}, jobDefineId:{}",
+ "receive createExecuteResource request, userId:{}, jobDefineId:{}",
userId,
- projectCode,
jobDefineId);
JobDefinition job = jobDefinitionDao.getJob(jobDefineId);
JobVersion latestVersion = jobVersionDao.getLatestVersion(job.getId());
@@ -147,6 +146,9 @@ public class JobInstanceServiceImpl extends SeatunnelBaseServiceImpl
jobInstance.setEngineVersion(latestVersion.getEngineVersion());
jobInstance.setJobConfig(jobConfig);
jobInstance.setCreateUserId(userId);
+ if (!latestVersion.getJobMode().isEmpty()) {
+ jobInstance.setJobType(latestVersion.getJobMode());
+ }
jobInstanceDao.insert(jobInstance);
@@ -155,7 +157,8 @@ public class JobInstanceServiceImpl extends SeatunnelBaseServiceImpl
jobInstance.getJobConfig(),
jobInstance.getEngineName(),
null,
- null);
+ null,
+ jobInstance.getJobType());
}
@Override
@@ -333,22 +336,19 @@ public class JobInstanceServiceImpl extends SeatunnelBaseServiceImpl
jobInstance.getJobConfig(),
jobInstance.getEngineName(),
null,
- null);
+ null,
+ jobInstance.getJobType());
}
@Override
public void complete(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId) {
+ @NonNull Integer userId, @NonNull Long jobInstanceId, @NonNull String jobEngineId) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_EXECUTOR_COMPLETE, userId);
JobInstance jobInstance = jobInstanceDao.getJobInstanceMapper().selectById(jobInstanceId);
- jobMetricsService.syncJobDataToDb(jobInstance, userId, projectCode, jobEngineId);
+ jobMetricsService.syncJobDataToDb(jobInstance, userId, jobEngineId);
List<JobPipelineSummaryMetricsRes> status =
- jobMetricsService.getJobPipelineSummaryMetrics(
- userId, projectCode, jobInstanceId, jobEngineId);
+ jobMetricsService.getJobPipelineSummaryMetrics(userId, jobInstanceId);
String jobStatus;
Set<String> statusList =
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobMetricsServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobMetricsServiceImpl.java
index 26d57f50..65779b7e 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobMetricsServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobMetricsServiceImpl.java
@@ -29,6 +29,7 @@ import org.apache.seatunnel.app.domain.response.metrics.JobPipelineSummaryMetric
import org.apache.seatunnel.app.domain.response.metrics.JobSummaryMetricsRes;
import org.apache.seatunnel.app.permission.constants.SeatunnelFuncPermissionKeyConstant;
import org.apache.seatunnel.app.service.IJobMetricsService;
+import org.apache.seatunnel.app.thirdparty.engine.SeaTunnelEngineProxy;
import org.apache.seatunnel.app.thirdparty.metrics.EngineMetricsExtractorFactory;
import org.apache.seatunnel.app.thirdparty.metrics.IEngineMetricsExtractor;
import org.apache.seatunnel.server.common.CodeGenerateUtils;
@@ -45,15 +46,23 @@ import org.springframework.stereotype.Service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Service
+@Slf4j
public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements IJobMetricsService {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -66,22 +75,18 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
@Override
public List<JobPipelineSummaryMetricsRes> getJobPipelineSummaryMetrics(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId) {
+ @NonNull Integer userId, @NonNull Long jobInstanceId) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_METRICS_SUMMARY, userId);
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
+ String jobEngineId = jobInstance.getJobEngineId();
List<JobMetrics> jobPipelineDetailMetrics =
- getJobPipelineMetrics(userId, projectCode, jobInstanceId, jobEngineId);
+ getJobPipelineMetrics(userId, jobInstanceId, jobEngineId);
return summaryMetrics(jobPipelineDetailMetrics);
}
@Override
public JobSummaryMetricsRes getJobSummaryMetrics(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId) {
+ @NonNull Integer userId, @NonNull Long jobInstanceId, @NonNull String jobEngineId) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_METRICS_SUMMARY, userId);
JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
Engine engine = new Engine(jobInstance.getEngineName(), jobInstance.getEngineVersion());
@@ -90,7 +95,7 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
String jobStatus = engineMetricsExtractor.getJobStatus(jobEngineId);
List<JobMetrics> jobPipelineDetailMetrics =
- getJobPipelineMetrics(userId, projectCode, jobInstanceId, jobEngineId);
+ getJobPipelineMetrics(userId, jobInstanceId, jobEngineId);
long readCount =
jobPipelineDetailMetrics.stream().mapToLong(JobMetrics::getReadRowCount).sum();
long writeCount =
@@ -102,10 +107,326 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
return jobSummaryMetricsRes;
}
+ @Override
+ public Map<Long, JobSummaryMetricsRes> getALLJobSummaryMetrics(
+ @NonNull Integer userId,
+ @NonNull Map<Long, Long> jobInstanceIdAndJobEngineIdMap,
+ @NonNull List<Long> jobInstanceIdList,
+ @NonNull String syncTaskType) {
+ log.info("jobInstanceIdAndJobEngineIdMap={}", jobInstanceIdAndJobEngineIdMap);
+
+ funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_METRICS_SUMMARY, userId);
+ List<JobInstance> allJobInstance = jobInstanceDao.getAllJobInstance(jobInstanceIdList);
+ Map<Long, JobSummaryMetricsRes> result = null;
+ Map<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsFromEngine =
+ getAllRunningJobMetricsFromEngine(
+ allJobInstance.get(0).getEngineName(),
+ allJobInstance.get(0).getEngineVersion());
+
+ if (syncTaskType.equals("BATCH")) {
+
+ result =
+ getMatricsListIfTaskTypeIsBatch(
+ allJobInstance,
+ userId,
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap);
+ } else if (syncTaskType.equals("STREAMING")) {
+ result =
+ getMatricsListIfTaskTypeIsStreaming(
+ allJobInstance,
+ userId,
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap);
+ }
+
+ log.info("result is {}", result.toString());
+ return result;
+ }
+
+ private Map<Long, JobSummaryMetricsRes> getMatricsListIfTaskTypeIsBatch(
+ List<JobInstance> allJobInstance,
+ Integer userId,
+ Map<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsFromEngine,
+ Map<Long, Long> jobInstanceIdAndJobEngineIdMap) {
+
+ HashMap<Long, JobSummaryMetricsRes> jobSummaryMetricsResMap = new HashMap<>();
+
+ log.info("allRunningJobMetricsFromEngine is {}", allRunningJobMetricsFromEngine.toString());
+
+ // Traverse all jobInstances in allJobInstance
+ for (JobInstance jobInstance : allJobInstance) {
+ log.info("jobEngineId={}", jobInstance.getJobEngineId());
+
+ if (jobInstance.getJobStatus() == null
+ || jobInstance.getJobStatus().equals("FAILED")
+ || jobInstance.getJobStatus().equals("RUNNING")) {
+ // Obtain monitoring information from the collection of running jobs returned from
+ // the engine
+ if (allRunningJobMetricsFromEngine.containsKey(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId()))) {
+ JobSummaryMetricsRes jobMetricsFromEngineRes =
+ getRunningJobMetricsFromEngine(
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ jobInstance);
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetricsFromEngineRes);
+ modifyAndUpdateJobInstanceAndJobMetrics(
+ jobInstance,
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ userId);
+
+ } else {
+ log.info(
+ "The job does not exist on the engine, it is directly returned from the database");
+ JobSummaryMetricsRes jobMetriceFromDb =
+ getJobSummaryMetricsResByDb(
+ jobInstance,
+ userId,
+ Long.toString(
+ jobInstanceIdAndJobEngineIdMap.get(
+ jobInstance.getId())));
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetriceFromDb);
+
+ // TODO:将数据库中的jobInstance和jobMetrics的作业状态改为finished
+ }
+ } else if (jobInstance.getJobStatus().equals("FINISHED")
+ || jobInstance.getJobStatus().equals("CANCELED")) {
+ // If the status of the job is finished or cancelled, the monitoring information is
+ // directly obtained from MySQL
+ JobSummaryMetricsRes jobMetriceFromDb =
+ getJobSummaryMetricsResByDb(
+ jobInstance,
+ userId,
+ Long.toString(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId())));
+ log.info("jobStatus=finish oe canceled,JobSummaryMetricsRes={}", jobMetriceFromDb);
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetriceFromDb);
+ }
+ }
+
+ return jobSummaryMetricsResMap;
+ }
+
+ private void modifyAndUpdateJobInstanceAndJobMetrics(
+ JobInstance jobInstance,
+ Map<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsFromEngine,
+ Map<Long, Long> jobInstanceIdAndJobEngineIdMap,
+ Integer userId) {
+ jobInstance.setJobStatus("RUNNING");
+ HashMap<Integer, JobMetrics> jobMetricsFromEngine =
+ allRunningJobMetricsFromEngine.get(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId()));
+ List<JobMetrics> jobMetricsFromDb = jobMetricsDao.getByInstanceId(jobInstance.getId());
+ log.info("001jobMetricsFromDb={}", jobMetricsFromDb);
+
+ if (jobMetricsFromDb.isEmpty()) {
+ log.info("002jobMetricsFromDb == null");
+ syncMetricsToDbRunning(jobInstance, userId, jobMetricsFromEngine);
+ jobInstanceDao.update(jobInstance);
+ } else {
+ jobMetricsFromDb.stream()
+ .forEach(
+ jobMetrics ->
+ jobMetrics.setReadRowCount(
+ jobMetricsFromEngine
+ .get(jobMetrics.getPipelineId())
+ .getReadRowCount()));
+ jobMetricsFromDb.stream()
+ .forEach(
+ jobMetrics ->
+ jobMetrics.setWriteRowCount(
+ jobMetricsFromEngine
+ .get(jobMetrics.getPipelineId())
+ .getWriteRowCount()));
+ jobMetricsFromDb.stream().forEach(jobMetrics -> jobMetrics.setStatus("RUNNING"));
+
+ updateJobInstanceAndMetrics(jobInstance, jobMetricsFromDb);
+ }
+ }
+
+ private Map<Long, JobSummaryMetricsRes> getMatricsListIfTaskTypeIsStreaming(
+ List<JobInstance> allJobInstance,
+ Integer userId,
+ Map<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsFromEngine,
+ Map<Long, Long> jobInstanceIdAndJobEngineIdMap) {
+
+ HashMap<Long, JobSummaryMetricsRes> jobSummaryMetricsResMap = new HashMap<>();
+
+ // Traverse all jobInstances in allJobInstance
+ for (JobInstance jobInstance : allJobInstance) {
+
+ if (jobInstance.getJobStatus() != null
+ && jobInstance.getJobStatus().equals("CANCELED")) {
+ // If the status of the job is finished or cancelled
+ // the monitoring information is directly obtained from MySQL
+ JobSummaryMetricsRes jobMetriceFromDb =
+ getJobSummaryMetricsResByDb(
+ jobInstance,
+ userId,
+ Long.toString(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId())));
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetriceFromDb);
+
+ } else if (jobInstance.getJobStatus() != null
+ && (jobInstance.getJobStatus().equals("FINISHED")
+ || jobInstance.getJobStatus().equals("FAILED"))) {
+ // Obtain monitoring information from the collection of running jobs returned from
+ // the engine
+ if (allRunningJobMetricsFromEngine.containsKey(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId()))) {
+ // If it can be found, update the information in MySQL and return it to the
+ // front-end data
+ modifyAndUpdateJobInstanceAndJobMetrics(
+ jobInstance,
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ userId);
+
+ /** Return data from the front-end */
+ JobSummaryMetricsRes jobMetricsFromEngineRes =
+ getRunningJobMetricsFromEngine(
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ jobInstance);
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetricsFromEngineRes);
+ } else {
+ // If not found, obtain information from MySQL
+ JobSummaryMetricsRes jobMetriceFromDb =
+ getJobSummaryMetricsResByDb(
+ jobInstance,
+ userId,
+ Long.toString(
+ jobInstanceIdAndJobEngineIdMap.get(
+ jobInstance.getId())));
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetriceFromDb);
+ }
+ } else {
+ // Obtain monitoring information from the collection of running jobs returned from
+ // the engine
+ if (jobInstance.getJobStatus() == null
+ || (jobInstance.getJobStatus().equals("RUNNING")
+ && getJobStatusByJobEngineId(jobInstance.getJobEngineId())
+ .equals("RUNNING"))) {
+ modifyAndUpdateJobInstanceAndJobMetrics(
+ jobInstance,
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ userId);
+ /** Return data from the front-end */
+ JobSummaryMetricsRes jobMetricsFromEngineRes =
+ getRunningJobMetricsFromEngine(
+ allRunningJobMetricsFromEngine,
+ jobInstanceIdAndJobEngineIdMap,
+ jobInstance);
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetricsFromEngineRes);
+ } else {
+ JobSummaryMetricsRes jobMetriceFromDb =
+ getJobSummaryMetricsResByDb(
+ jobInstance,
+ userId,
+ Long.toString(
+ jobInstanceIdAndJobEngineIdMap.get(
+ jobInstance.getId())));
+ jobSummaryMetricsResMap.put(jobInstance.getId(), jobMetriceFromDb);
+ String jobStatusByJobEngineId =
+ getJobStatusByJobEngineId(jobInstance.getJobEngineId());
+ jobInstance.setJobStatus(jobStatusByJobEngineId);
+ jobInstanceDao.update(jobInstance);
+ }
+ }
+ }
+ return jobSummaryMetricsResMap;
+ }
+
+ private JobSummaryMetricsRes getRunningJobMetricsFromEngine(
+ Map<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsFromEngine,
+ Map<Long, Long> jobInstanceIdAndJobEngineIdMap,
+ JobInstance jobInstance) {
+
+ // If there is job information in the engine
+ HashMap<Integer, JobMetrics> jobMetricsFromEngine =
+ allRunningJobMetricsFromEngine.get(
+ jobInstanceIdAndJobEngineIdMap.get(jobInstance.getId()));
+ log.info("0706jobMetricsFromEngine={}", jobMetricsFromEngine);
+ long readCount = 0l;
+ long writeCount = 0l;
+
+ Collection<JobMetrics> values = jobMetricsFromEngine.values();
+ Iterator<JobMetrics> iterator = values.iterator();
+ while (iterator.hasNext()) {
+ JobMetrics next = iterator.next();
+ readCount += next.getReadRowCount();
+ }
+
+ writeCount =
+ jobMetricsFromEngine.values().stream()
+ .mapToLong(JobMetrics::getWriteRowCount)
+ .sum();
+
+ log.info("jobInstance={}", jobInstance.toString());
+
+ JobSummaryMetricsRes jobSummaryMetricsRes =
+ new JobSummaryMetricsRes(jobInstance.getId(), 1l, readCount, writeCount, "RUNNING");
+
+ return jobSummaryMetricsRes;
+ }
+
+ private JobSummaryMetricsRes getJobSummaryMetricsResByDb(
+ JobInstance jobInstance, Integer userId, String jobEngineId) {
+ List<JobMetrics> jobMetricsFromDb = getJobMetricsFromDb(jobInstance, userId, jobEngineId);
+ long readCount = jobMetricsFromDb.stream().mapToLong(JobMetrics::getReadRowCount).sum();
+ long writeCount = jobMetricsFromDb.stream().mapToLong(JobMetrics::getWriteRowCount).sum();
+ JobSummaryMetricsRes jobSummaryMetricsRes =
+ new JobSummaryMetricsRes(
+ jobInstance.getId(),
+ Long.valueOf(jobInstance.getJobEngineId()),
+ readCount,
+ writeCount,
+ jobInstance.getJobStatus());
+ return jobSummaryMetricsRes;
+ }
+
+ private Map<Long, HashMap<Integer, JobMetrics>> getAllRunningJobMetricsFromEngine(
+ String engineName, String engineVersion) {
+ Engine engine = new Engine(engineName, engineVersion);
+
+ IEngineMetricsExtractor engineMetricsExtractor =
+ (new EngineMetricsExtractorFactory(engine)).getEngineMetricsExtractor();
+
+ return engineMetricsExtractor.getAllRunningJobMetrics();
+ }
+
+ private void updateJobInstanceAndMetrics(JobInstance jobInstance, List<JobMetrics> jobMetrics) {
+ if (jobInstance != null && jobMetrics != null) {
+ jobInstanceDao.update(jobInstance);
+ // jobMetricsFromDb
+ for (JobMetrics jobMetric : jobMetrics) {
+ jobMetricsDao.getJobMetricsMapper().updateById(jobMetric);
+ }
+ }
+ }
+
+ private String getJobStatusByJobEngineId(String jobEngineId) {
+ return SeaTunnelEngineProxy.getInstance().getJobStatus(jobEngineId);
+ }
+
+ private Map<Integer, JobMetrics> getJobMetricsFromEngineMap(
+ @NonNull JobInstance jobInstance, @NonNull String jobEngineId) {
+
+ log.info("enter getJobMetricsFromEngine");
+ Engine engine = new Engine(jobInstance.getEngineName(), jobInstance.getEngineVersion());
+
+ IEngineMetricsExtractor engineMetricsExtractor =
+ (new EngineMetricsExtractorFactory(engine)).getEngineMetricsExtractor();
+
+ return engineMetricsExtractor.getMetricsByJobEngineIdRTMap(jobEngineId);
+ }
+
private List<JobMetrics> getJobPipelineDetailMetrics(
@NonNull JobInstance jobInstance,
@NonNull Integer userId,
- @NonNull Long projectCode,
@NonNull String jobEngineId,
@NonNull String jobStatus,
@NonNull IEngineMetricsExtractor engineMetricsExtractor) {
@@ -113,9 +434,9 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
// If job is not end state, get metrics from engine.
List<JobMetrics> jobMetrics = new ArrayList<>();
if (engineMetricsExtractor.isJobEndStatus(jobStatus)) {
- jobMetrics = getJobMetricsFromDb(jobInstance, userId, projectCode, jobEngineId);
+ jobMetrics = getJobMetricsFromDb(jobInstance, userId, jobEngineId);
if (CollectionUtils.isEmpty(jobMetrics)) {
- syncMetricsToDb(jobInstance, userId, projectCode, jobEngineId);
+ syncMetricsToDb(jobInstance, userId, jobEngineId);
jobMetrics = getJobMetricsFromEngine(jobInstance, jobEngineId);
}
} else {
@@ -127,23 +448,19 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
@Override
public List<JobPipelineDetailMetricsRes> getJobPipelineDetailMetricsRes(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId) {
+ @NonNull Integer userId, @NonNull Long jobInstanceId) {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_DETAIL, userId);
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
+ String jobEngineId = jobInstance.getJobEngineId();
List<JobMetrics> jobPipelineDetailMetrics =
- getJobPipelineMetrics(userId, projectCode, jobInstanceId, jobEngineId);
+ getJobPipelineMetrics(userId, jobInstanceId, jobEngineId);
return jobPipelineDetailMetrics.stream()
.map(this::wrapperJobMetrics)
.collect(Collectors.toList());
}
private List<JobMetrics> getJobPipelineMetrics(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId) {
+ @NonNull Integer userId, @NonNull Long jobInstanceId, @NonNull String jobEngineId) {
JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
Engine engine = new Engine(jobInstance.getEngineName(), jobInstance.getEngineVersion());
@@ -152,26 +469,17 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
String jobStatus = engineMetricsExtractor.getJobStatus(jobEngineId);
List<JobMetrics> jobPipelineDetailMetrics =
getJobPipelineDetailMetrics(
- jobInstance,
- userId,
- projectCode,
- jobEngineId,
- jobStatus,
- engineMetricsExtractor);
+ jobInstance, userId, jobEngineId, jobStatus, engineMetricsExtractor);
return jobPipelineDetailMetrics;
}
@Override
- public JobDAG getJobDAG(
- @NonNull Integer userId,
- @NonNull Long projectCode,
- @NonNull Long jobInstanceId,
- @NonNull String jobEngineId)
+ public JobDAG getJobDAG(@NonNull Integer userId, @NonNull Long jobInstanceId)
throws JsonProcessingException {
funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_DAG, userId);
JobInstance jobInstance = jobInstanceDao.getJobInstance(jobInstanceId);
- JobInstanceHistory history =
- getJobHistoryFromDb(jobInstance, userId, jobEngineId, projectCode);
+ String jobEngineId = jobInstance.getJobEngineId();
+ JobInstanceHistory history = getJobHistoryFromDb(jobInstance, userId, jobEngineId);
if (history != null) {
String dag = history.getDag();
try {
@@ -185,8 +493,8 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
(new EngineMetricsExtractorFactory(engine)).getEngineMetricsExtractor();
if (engineMetricsExtractor.isJobEnd(jobEngineId)) {
- syncJobInfoToDb(jobInstance, projectCode, jobEngineId);
- history = getJobHistoryFromDb(jobInstance, userId, jobEngineId, projectCode);
+ syncHistoryJobInfoToDb(jobInstance, jobEngineId);
+ history = getJobHistoryFromDb(jobInstance, userId, jobEngineId);
} else {
history = getJobHistoryFromEngine(jobInstance, jobEngineId);
}
@@ -213,55 +521,68 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
}
private JobInstanceHistory getJobHistoryFromDb(
- @NonNull JobInstance jobInstance,
- Integer userId,
- String jobEngineId,
- Long projectCode) {
+ @NonNull JobInstance jobInstance, Integer userId, String jobEngineId) {
// relation jobInstanceId and jobEngineId
relationJobInstanceAndJobEngineId(jobInstance, userId, jobEngineId);
- return jobInstanceHistoryDao.getByInstanceId(jobInstance.getId(), projectCode);
+ return jobInstanceHistoryDao.getByInstanceId(jobInstance.getId());
}
@Override
public void syncJobDataToDb(
@NonNull JobInstance jobInstance,
@NonNull Integer userId,
- @NonNull Long projectCode,
@NonNull String jobEngineId) {
relationJobInstanceAndJobEngineId(jobInstance, userId, jobEngineId);
- syncMetricsToDb(jobInstance, userId, projectCode, jobEngineId);
- syncJobInfoToDb(jobInstance, projectCode, jobEngineId);
+ syncMetricsToDb(jobInstance, userId, jobEngineId);
+ syncHistoryJobInfoToDb(jobInstance, jobEngineId);
+ syncCompleteJobInfoToDb(jobInstance);
}
private void syncMetricsToDb(
@NonNull JobInstance jobInstance,
@NonNull Integer userId,
- @NonNull Long projectCode,
@NonNull String jobEngineId) {
- List<JobMetrics> jobMetricsFromEngine = getJobMetricsFromEngine(jobInstance, jobEngineId);
-
- jobMetricsFromEngine.forEach(
- metrics -> {
- try {
- metrics.setId(CodeGenerateUtils.getInstance().genCode());
- } catch (CodeGenerateUtils.CodeGenerateException e) {
- throw new SeatunnelException(
- SeatunnelErrorEnum.JOB_RUN_GENERATE_UUID_ERROR);
- }
- metrics.setJobInstanceId(jobInstance.getId());
- metrics.setCreateUserId(userId);
- metrics.setUpdateUserId(userId);
- });
-
- if (!jobMetricsFromEngine.isEmpty()) {
- jobMetricsDao.getJobMetricsMapper().insertBatchMetrics(jobMetricsFromEngine);
+ Map<Integer, JobMetrics> jobMetricsFromEngineMap =
+ getJobMetricsFromEngineMap(jobInstance, jobEngineId);
+
+ List<JobMetrics> jobMetricsFromDb = getJobMetricsFromDb(jobInstance, userId, jobEngineId);
+ if (jobMetricsFromDb.isEmpty()) {
+ List<JobMetrics> jobMetricsFromEngine =
+ Arrays.asList(jobMetricsFromEngineMap.values().toArray(new JobMetrics[0]));
+ jobMetricsFromEngine.forEach(
+ metrics -> {
+ try {
+ metrics.setId(CodeGenerateUtils.getInstance().genCode());
+ } catch (CodeGenerateUtils.CodeGenerateException e) {
+ throw new SeatunnelException(
+ SeatunnelErrorEnum.JOB_RUN_GENERATE_UUID_ERROR);
+ }
+ metrics.setJobInstanceId(jobInstance.getId());
+ metrics.setCreateUserId(userId);
+ metrics.setUpdateUserId(userId);
+ });
+
+ if (!jobMetricsFromEngine.isEmpty()) {
+ jobMetricsDao.getJobMetricsMapper().insertBatchMetrics(jobMetricsFromEngine);
+ }
+ } else {
+ String jobStatus = getJobStatusByJobEngineId(jobEngineId);
+ for (JobMetrics jobMetrics : jobMetricsFromDb) {
+ Integer pipelineId = jobMetrics.getPipelineId();
+ JobMetrics currentPiplinejobMetricsFromEngine =
+ jobMetricsFromEngineMap.get(pipelineId);
+ jobMetrics.setWriteQps(currentPiplinejobMetricsFromEngine.getWriteQps());
+ jobMetrics.setReadQps(currentPiplinejobMetricsFromEngine.getReadQps());
+ jobMetrics.setReadRowCount(currentPiplinejobMetricsFromEngine.getReadRowCount());
+ jobMetrics.setWriteRowCount(currentPiplinejobMetricsFromEngine.getWriteRowCount());
+ jobMetrics.setStatus(jobStatus);
+ jobMetricsDao.getJobMetricsMapper().updateById(jobMetrics);
+ }
}
}
- private void syncJobInfoToDb(
- @NonNull JobInstance jobInstance,
- @NonNull Long projectCode,
- @NonNull String jobEngineId) {
+ private void syncHistoryJobInfoToDb(
+ @NonNull JobInstance jobInstance, @NonNull String jobEngineId) {
JobInstanceHistory jobHistoryFromEngine = getJobHistoryFromEngine(jobInstance, jobEngineId);
jobHistoryFromEngine.setId(jobInstance.getId());
@@ -269,6 +590,11 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
jobInstanceHistoryDao.insert(jobHistoryFromEngine);
}
+ private void syncCompleteJobInfoToDb(@NonNull JobInstance jobInstance) {
+ jobInstance.setEndTime(new Date());
+ jobInstanceDao.update(jobInstance);
+ }
+
private void relationJobInstanceAndJobEngineId(
@NonNull JobInstance jobInstance,
@NonNull Integer userId,
@@ -307,14 +633,13 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
private List<JobMetrics> getJobMetricsFromDb(
@NonNull JobInstance jobInstance,
@NonNull Integer userId,
- @NonNull Long projectCode,
@NonNull String jobEngineId) {
// relation jobInstanceId and jobEngineId
relationJobInstanceAndJobEngineId(jobInstance, userId, jobEngineId);
// get metrics from db
- return jobMetricsDao.getByInstanceId(projectCode, jobInstance.getId());
+ return jobMetricsDao.getByInstanceId(jobInstance.getId());
}
@Override
@@ -343,4 +668,24 @@ public class JobMetricsServiceImpl extends SeatunnelBaseServiceImpl implements I
metrics.getRecordDelay(),
metrics.getStatus());
}
+
+ private void syncMetricsToDbRunning(
+ @NonNull JobInstance jobInstance,
+ @NonNull Integer userId,
+ @NonNull Map<Integer, JobMetrics> jobMetricsMap) {
+
+ ArrayList<JobMetrics> list = new ArrayList<>();
+ for (Map.Entry<Integer, JobMetrics> entry : jobMetricsMap.entrySet()) {
+ JobMetrics jobMetrics = entry.getValue();
+ jobMetrics.setId(CodeGenerateUtils.getInstance().genCode());
+ jobMetrics.setJobInstanceId(jobInstance.getId());
+ jobMetrics.setCreateUserId(userId);
+ jobMetrics.setUpdateUserId(userId);
+ list.add(jobMetrics);
+ }
+ if (!list.isEmpty()) {
+ log.info("003list={}", list);
+ jobMetricsDao.getJobMetricsMapper().insertBatchMetrics(list);
+ }
+ }
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/ScriptServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/ScriptServiceImpl.java
index 2ed88f2a..db7db8c2 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/ScriptServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/ScriptServiceImpl.java
@@ -1,259 +1,261 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.app.service.impl;
-
-import org.apache.seatunnel.app.common.ScriptParamStatusEnum;
-import org.apache.seatunnel.app.common.ScriptStatusEnum;
-import org.apache.seatunnel.app.dal.dao.IScriptDao;
-import org.apache.seatunnel.app.dal.dao.IScriptParamDao;
-import org.apache.seatunnel.app.dal.dao.IUserDao;
-import org.apache.seatunnel.app.dal.entity.Script;
-import org.apache.seatunnel.app.dal.entity.ScriptParam;
-import org.apache.seatunnel.app.domain.dto.job.PushScriptDto;
-import org.apache.seatunnel.app.domain.dto.script.CheckScriptDuplicateDto;
-import org.apache.seatunnel.app.domain.dto.script.CreateScriptDto;
-import org.apache.seatunnel.app.domain.dto.script.ListScriptsDto;
-import org.apache.seatunnel.app.domain.dto.script.UpdateScriptContentDto;
-import org.apache.seatunnel.app.domain.dto.script.UpdateScriptParamDto;
-import org.apache.seatunnel.app.domain.request.script.CreateScriptReq;
-import org.apache.seatunnel.app.domain.request.script.PublishScriptReq;
-import org.apache.seatunnel.app.domain.request.script.ScriptListReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptContentReq;
-import org.apache.seatunnel.app.domain.request.script.UpdateScriptParamReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.script.CreateScriptRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptFullInfoRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptParamRes;
-import org.apache.seatunnel.app.domain.response.script.ScriptSimpleInfoRes;
-import org.apache.seatunnel.app.service.IScriptService;
-import org.apache.seatunnel.app.service.ITaskService;
-import org.apache.seatunnel.app.utils.Md5Utils;
-import org.apache.seatunnel.scheduler.dolphinscheduler.impl.InstanceServiceImpl;
-import org.apache.seatunnel.server.common.PageData;
-
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import com.google.common.base.Strings;
-
-import javax.annotation.Resource;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkState;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_SCRIPT;
-
-@Component
-public class ScriptServiceImpl implements IScriptService {
-
- @Resource private IScriptDao scriptDaoImpl;
-
- @Resource private IScriptParamDao scriptParamDaoImpl;
-
- @Resource private InstanceServiceImpl instanceService;
-
- @Resource private IUserDao userDaoImpl;
-
- @Resource private ITaskService iTaskService;
-
- @Override
- public CreateScriptRes createScript(CreateScriptReq createScriptReq) {
- // 1. check script name.
- checkDuplicate(createScriptReq.getName(), createScriptReq.getCreatorId());
- // 2. create script
- int scriptId =
- translate(
- createScriptReq.getName(),
- createScriptReq.getCreatorId(),
- createScriptReq.getCreatorId(),
- createScriptReq.getType(),
- createScriptReq.getContent());
-
- final CreateScriptRes res = new CreateScriptRes();
- res.setId(scriptId);
- return res;
- }
-
- private int translate(
- String name, Integer creatorId, Integer menderId, Byte type, String content) {
- final CreateScriptDto dto =
- CreateScriptDto.builder()
- .name(name)
- .menderId(creatorId)
- .creatorId(menderId)
- .type(type)
- .status((byte) ScriptStatusEnum.UNPUBLISHED.getCode())
- .content(content)
- .build();
- return scriptDaoImpl.createScript(dto);
- }
-
- private void checkDuplicate(String name, Integer creatorId) {
- final CheckScriptDuplicateDto dto =
- CheckScriptDuplicateDto.builder().creatorId(creatorId).name(name).build();
- scriptDaoImpl.checkScriptDuplicate(dto);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateScriptContent(UpdateScriptContentReq updateScriptContentReq) {
- // 1. check content md5 is consistent
- final String content = updateScriptContentReq.getContent();
- final String contentMd5 = Strings.isNullOrEmpty(content) ? "" : Md5Utils.toMd5(content);
-
- final boolean needSave = checkIfNeedSave(updateScriptContentReq.getScriptId(), contentMd5);
-
- if (needSave) {
- final UpdateScriptContentDto dto =
- UpdateScriptContentDto.builder()
- .id(updateScriptContentReq.getScriptId())
- .content(content)
- .contentMd5(contentMd5)
- .menderId(updateScriptContentReq.getMenderId())
- .build();
- scriptDaoImpl.updateScriptContent(dto);
- }
- }
-
- private boolean checkIfNeedSave(int id, String newContentMd5) {
- Script script = scriptDaoImpl.getScript(id);
- checkState(
- Objects.nonNull(script)
- && (int) script.getStatus() != ScriptStatusEnum.DELETED.getCode(),
- NO_SUCH_SCRIPT.getTemplate());
-
- final String oldContentMd5 =
- Strings.isNullOrEmpty(script.getContentMd5()) ? "" : script.getContentMd5();
- return !newContentMd5.equals(oldContentMd5);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(Integer id) {
- // no need check script if exist.
- scriptDaoImpl.deleteScript(id);
- }
-
- @Override
- public PageInfo<ScriptSimpleInfoRes> list(ScriptListReq scriptListReq) {
-
- final ListScriptsDto dto = ListScriptsDto.builder().name(scriptListReq.getName()).build();
-
- PageData<Script> scriptPageData =
- scriptDaoImpl.list(dto, scriptListReq.getRealPageNo(), scriptListReq.getPageSize());
- final List<ScriptSimpleInfoRes> data =
- scriptPageData.getData().stream().map(this::translate).collect(Collectors.toList());
-
- final PageInfo<ScriptSimpleInfoRes> pageInfo = new PageInfo<>();
- pageInfo.setPageNo(scriptListReq.getPageNo());
- pageInfo.setPageSize(scriptListReq.getPageSize());
- pageInfo.setTotalCount(scriptPageData.getTotalCount());
- pageInfo.setData(data);
- return pageInfo;
- }
-
- @Override
- public String fetchScriptContent(Integer id) {
- Script script = scriptDaoImpl.getScript(id);
- checkState(Objects.nonNull(script), NO_SUCH_SCRIPT.getTemplate());
- return script.getContent();
- }
-
- @Override
- public List<ScriptParamRes> fetchScriptParam(Integer id) {
- List<ScriptParam> scriptParamRes = scriptParamDaoImpl.getParamsByScriptId(id);
- if (CollectionUtils.isEmpty(scriptParamRes)) {
- return Collections.emptyList();
- }
- return scriptParamRes.stream().map(this::translate).collect(Collectors.toList());
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateScriptParam(UpdateScriptParamReq updateScriptParamReq) {
- // 1. delete all old params first.
- // 2. save new params. (check params correctness)
- scriptParamDaoImpl.updateStatusByScriptId(
- updateScriptParamReq.getScriptId(), ScriptParamStatusEnum.DELETED.getCode());
-
- UpdateScriptParamDto dto =
- UpdateScriptParamDto.builder()
- .scriptId(updateScriptParamReq.getScriptId())
- .params(updateScriptParamReq.getParams())
- .build();
-
- scriptParamDaoImpl.batchInsert(dto);
- }
-
- @Override
- public void publishScript(PublishScriptReq req) {
- final PushScriptDto dto =
- PushScriptDto.builder()
- .scriptId(req.getScriptId())
- .userId(req.getOperatorId())
- .build();
- iTaskService.pushScriptToScheduler(dto);
- }
-
- @Override
- public ScriptFullInfoRes detail(Integer scriptId) {
- final Script script = scriptDaoImpl.getScript(scriptId);
-
- checkState(Objects.nonNull(script), NO_SUCH_SCRIPT.getTemplate());
- return translateToFull(script);
- }
-
- private ScriptParamRes translate(ScriptParam scriptParam) {
- final ScriptParamRes res = new ScriptParamRes();
- res.setId(scriptParam.getId());
- res.setKey(scriptParam.getKey());
- res.setValue(scriptParam.getValue());
- return res;
- }
-
- private ScriptSimpleInfoRes translate(Script script) {
- final ScriptSimpleInfoRes res = new ScriptSimpleInfoRes();
- res.setId(script.getId());
- res.setName(script.getName());
- res.setStatus(ScriptStatusEnum.parse(script.getStatus()));
- res.setType(script.getType());
- res.setCreatorId(script.getCreatorId());
- res.setMenderId(script.getMenderId());
- res.setCreateTime(script.getCreateTime());
- res.setUpdateTime(script.getUpdateTime());
- return res;
- }
-
- private ScriptFullInfoRes translateToFull(Script script) {
- final ScriptFullInfoRes res = new ScriptFullInfoRes();
- res.setId(script.getId());
- res.setName(script.getName());
- res.setStatus(ScriptStatusEnum.parse(script.getStatus()));
- res.setType(script.getType());
- res.setCreatorId(script.getCreatorId());
- res.setMenderId(script.getMenderId());
- res.setCreateTime(script.getCreateTime());
- res.setUpdateTime(script.getUpdateTime());
- res.setContent(script.getContent());
- return res;
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.app.service.impl;
+//
+// import org.apache.seatunnel.app.common.ScriptParamStatusEnum;
+// import org.apache.seatunnel.app.common.ScriptStatusEnum;
+// import org.apache.seatunnel.app.dal.dao.IScriptDao;
+// import org.apache.seatunnel.app.dal.dao.IScriptParamDao;
+// import org.apache.seatunnel.app.dal.dao.IUserDao;
+// import org.apache.seatunnel.app.dal.entity.Script;
+// import org.apache.seatunnel.app.dal.entity.ScriptParam;
+// import org.apache.seatunnel.app.domain.dto.job.PushScriptDto;
+// import org.apache.seatunnel.app.domain.dto.script.CheckScriptDuplicateDto;
+// import org.apache.seatunnel.app.domain.dto.script.CreateScriptDto;
+// import org.apache.seatunnel.app.domain.dto.script.ListScriptsDto;
+// import org.apache.seatunnel.app.domain.dto.script.UpdateScriptContentDto;
+// import org.apache.seatunnel.app.domain.dto.script.UpdateScriptParamDto;
+// import org.apache.seatunnel.app.domain.request.script.CreateScriptReq;
+// import org.apache.seatunnel.app.domain.request.script.PublishScriptReq;
+// import org.apache.seatunnel.app.domain.request.script.ScriptListReq;
+// import org.apache.seatunnel.app.domain.request.script.UpdateScriptContentReq;
+// import org.apache.seatunnel.app.domain.request.script.UpdateScriptParamReq;
+// import org.apache.seatunnel.app.domain.response.PageInfo;
+// import org.apache.seatunnel.app.domain.response.script.CreateScriptRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptFullInfoRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptParamRes;
+// import org.apache.seatunnel.app.domain.response.script.ScriptSimpleInfoRes;
+// import org.apache.seatunnel.app.service.IScriptService;
+//// import org.apache.seatunnel.app.service.ITaskService;
+// import org.apache.seatunnel.app.utils.Md5Utils;
+//
+// import org.apache.seatunnel.server.common.PageData;
+//
+// import org.springframework.stereotype.Component;
+// import org.springframework.transaction.annotation.Transactional;
+// import org.springframework.util.CollectionUtils;
+//
+// import com.google.common.base.Strings;
+//
+// import javax.annotation.Resource;
+//
+// import java.util.Collections;
+// import java.util.List;
+// import java.util.Objects;
+// import java.util.stream.Collectors;
+//
+// import static com.google.common.base.Preconditions.checkState;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_SCRIPT;
+//
+// @Component
+// public class ScriptServiceImpl implements IScriptService {
+//
+// @Resource private IScriptDao scriptDaoImpl;
+//
+// @Resource private IScriptParamDao scriptParamDaoImpl;
+//
+//
+// @Resource private IUserDao userDaoImpl;
+//
+//// @Resource private ITaskService iTaskService;
+//
+// @Override
+// public CreateScriptRes createScript(CreateScriptReq createScriptReq) {
+// // 1. check script name.
+// checkDuplicate(createScriptReq.getName(), createScriptReq.getCreatorId());
+// // 2. create script
+// int scriptId =
+// translate(
+// createScriptReq.getName(),
+// createScriptReq.getCreatorId(),
+// createScriptReq.getCreatorId(),
+// createScriptReq.getType(),
+// createScriptReq.getContent());
+//
+// final CreateScriptRes res = new CreateScriptRes();
+// res.setId(scriptId);
+// return res;
+// }
+//
+// private int translate(
+// String name, Integer creatorId, Integer menderId, Byte type, String content) {
+// final CreateScriptDto dto =
+// CreateScriptDto.builder()
+// .name(name)
+// .menderId(creatorId)
+// .creatorId(menderId)
+// .type(type)
+// .status((byte) ScriptStatusEnum.UNPUBLISHED.getCode())
+// .content(content)
+// .build();
+// return scriptDaoImpl.createScript(dto);
+// }
+//
+// private void checkDuplicate(String name, Integer creatorId) {
+// final CheckScriptDuplicateDto dto =
+// CheckScriptDuplicateDto.builder().creatorId(creatorId).name(name).build();
+// scriptDaoImpl.checkScriptDuplicate(dto);
+// }
+//
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void updateScriptContent(UpdateScriptContentReq updateScriptContentReq) {
+// // 1. check content md5 is consistent
+// final String content = updateScriptContentReq.getContent();
+// final String contentMd5 = Strings.isNullOrEmpty(content) ? "" : Md5Utils.toMd5(content);
+//
+// final boolean needSave = checkIfNeedSave(updateScriptContentReq.getScriptId(),
+// contentMd5);
+//
+// if (needSave) {
+// final UpdateScriptContentDto dto =
+// UpdateScriptContentDto.builder()
+// .id(updateScriptContentReq.getScriptId())
+// .content(content)
+// .contentMd5(contentMd5)
+// .menderId(updateScriptContentReq.getMenderId())
+// .build();
+// scriptDaoImpl.updateScriptContent(dto);
+// }
+// }
+//
+// private boolean checkIfNeedSave(int id, String newContentMd5) {
+// Script script = scriptDaoImpl.getScript(id);
+// checkState(
+// Objects.nonNull(script)
+// && (int) script.getStatus() != ScriptStatusEnum.DELETED.getCode(),
+// NO_SUCH_SCRIPT.getTemplate());
+//
+// final String oldContentMd5 =
+// Strings.isNullOrEmpty(script.getContentMd5()) ? "" : script.getContentMd5();
+// return !newContentMd5.equals(oldContentMd5);
+// }
+//
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void delete(Integer id) {
+// // no need check script if exist.
+// scriptDaoImpl.deleteScript(id);
+// }
+//
+// @Override
+// public PageInfo<ScriptSimpleInfoRes> list(ScriptListReq scriptListReq) {
+//
+// final ListScriptsDto dto = ListScriptsDto.builder().name(scriptListReq.getName()).build();
+//
+// PageData<Script> scriptPageData =
+// scriptDaoImpl.list(dto, scriptListReq.getRealPageNo(),
+// scriptListReq.getPageSize());
+// final List<ScriptSimpleInfoRes> data =
+//
+// scriptPageData.getData().stream().map(this::translate).collect(Collectors.toList());
+//
+// final PageInfo<ScriptSimpleInfoRes> pageInfo = new PageInfo<>();
+// pageInfo.setPageNo(scriptListReq.getPageNo());
+// pageInfo.setPageSize(scriptListReq.getPageSize());
+// pageInfo.setTotalCount(scriptPageData.getTotalCount());
+// pageInfo.setData(data);
+// return pageInfo;
+// }
+//
+// @Override
+// public String fetchScriptContent(Integer id) {
+// Script script = scriptDaoImpl.getScript(id);
+// checkState(Objects.nonNull(script), NO_SUCH_SCRIPT.getTemplate());
+// return script.getContent();
+// }
+//
+// @Override
+// public List<ScriptParamRes> fetchScriptParam(Integer id) {
+// List<ScriptParam> scriptParamRes = scriptParamDaoImpl.getParamsByScriptId(id);
+// if (CollectionUtils.isEmpty(scriptParamRes)) {
+// return Collections.emptyList();
+// }
+// return scriptParamRes.stream().map(this::translate).collect(Collectors.toList());
+// }
+//
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void updateScriptParam(UpdateScriptParamReq updateScriptParamReq) {
+// // 1. delete all old params first.
+// // 2. save new params. (check params correctness)
+// scriptParamDaoImpl.updateStatusByScriptId(
+// updateScriptParamReq.getScriptId(), ScriptParamStatusEnum.DELETED.getCode());
+//
+// UpdateScriptParamDto dto =
+// UpdateScriptParamDto.builder()
+// .scriptId(updateScriptParamReq.getScriptId())
+// .params(updateScriptParamReq.getParams())
+// .build();
+//
+// scriptParamDaoImpl.batchInsert(dto);
+// }
+//
+// @Override
+// public void publishScript(PublishScriptReq req) {
+// final PushScriptDto dto =
+// PushScriptDto.builder()
+// .scriptId(req.getScriptId())
+// .userId(req.getOperatorId())
+// .build();
+// iTaskService.pushScriptToScheduler(dto);
+// }
+//
+// @Override
+// public ScriptFullInfoRes detail(Integer scriptId) {
+// final Script script = scriptDaoImpl.getScript(scriptId);
+//
+// checkState(Objects.nonNull(script), NO_SUCH_SCRIPT.getTemplate());
+// return translateToFull(script);
+// }
+//
+// private ScriptParamRes translate(ScriptParam scriptParam) {
+// final ScriptParamRes res = new ScriptParamRes();
+// res.setId(scriptParam.getId());
+// res.setKey(scriptParam.getKey());
+// res.setValue(scriptParam.getValue());
+// return res;
+// }
+//
+// private ScriptSimpleInfoRes translate(Script script) {
+// final ScriptSimpleInfoRes res = new ScriptSimpleInfoRes();
+// res.setId(script.getId());
+// res.setName(script.getName());
+// res.setStatus(ScriptStatusEnum.parse(script.getStatus()));
+// res.setType(script.getType());
+// res.setCreatorId(script.getCreatorId());
+// res.setMenderId(script.getMenderId());
+// res.setCreateTime(script.getCreateTime());
+// res.setUpdateTime(script.getUpdateTime());
+// return res;
+// }
+//
+// private ScriptFullInfoRes translateToFull(Script script) {
+// final ScriptFullInfoRes res = new ScriptFullInfoRes();
+// res.setId(script.getId());
+// res.setName(script.getName());
+// res.setStatus(ScriptStatusEnum.parse(script.getStatus()));
+// res.setType(script.getType());
+// res.setCreatorId(script.getCreatorId());
+// res.setMenderId(script.getMenderId());
+// res.setCreateTime(script.getCreateTime());
+// res.setUpdateTime(script.getUpdateTime());
+// res.setContent(script.getContent());
+// return res;
+// }
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
new file mode 100644
index 00000000..19b75f38
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskInstanceServiceImpl.java
@@ -0,0 +1,173 @@
+package org.apache.seatunnel.app.service.impl;
+
+import org.apache.seatunnel.app.common.Result;
+import org.apache.seatunnel.app.common.Status;
+import org.apache.seatunnel.app.dal.dao.IJobDefinitionDao;
+import org.apache.seatunnel.app.dal.dao.IJobInstanceDao;
+import org.apache.seatunnel.app.dal.entity.JobDefinition;
+import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
+import org.apache.seatunnel.app.domain.response.metrics.JobSummaryMetricsRes;
+import org.apache.seatunnel.app.service.BaseService;
+import org.apache.seatunnel.app.service.IJobDefinitionService;
+import org.apache.seatunnel.app.service.IJobMetricsService;
+import org.apache.seatunnel.app.service.ITaskInstanceService;
+import org.apache.seatunnel.app.utils.PageInfo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** @Description @ClassName TaskInstanceService @Author zhang @Date 2023/7/4 14:00 */
+@Service
+@Slf4j
+public class TaskInstanceServiceImpl implements ITaskInstanceService {
+
+ @Autowired IJobInstanceDao jobInstanceDao;
+
+ @Autowired IJobMetricsService jobMetricsService;
+
+ @Autowired IJobDefinitionService jobDefinitionService;
+
+ @Autowired BaseService baseService;
+
+ @Autowired IJobDefinitionDao jobDefinitionDao;
+
+ @Override
+ public Result getSyncTaskInstancePaging(
+ Integer userId,
+ String jobDefineName,
+ String executorName,
+ String stateType,
+ String startTime,
+ String endTime,
+ String syncTaskType,
+ Integer pageNo,
+ Integer pageSize) {
+ /** 根据过滤条件查出所有的TaskTnstance(List) */
+ JobDefinition jobDefinition = null;
+ IPage<SeaTunnelJobInstanceDto> jobInstanceIPage = null;
+ if (jobDefineName != null) {
+ jobDefinition = jobDefinitionDao.getJobByName(jobDefineName);
+ }
+
+ Result<PageInfo<SeaTunnelJobInstanceDto>> result = new Result<>();
+ PageInfo<SeaTunnelJobInstanceDto> pageInfo = new PageInfo<>(pageNo, pageSize);
+ result.setData(pageInfo);
+ baseService.putMsg(result, Status.SUCCESS);
+
+ Date startDate = dateConverter(startTime);
+ Date endDate = dateConverter(endTime);
+
+ if (jobDefinition != null) {
+ jobInstanceIPage =
+ jobInstanceDao.queryJobInstanceListPaging(
+ new Page<>(pageNo, pageSize),
+ startDate,
+ endDate,
+ jobDefinition.getId(),
+ syncTaskType);
+ } else {
+ jobInstanceIPage =
+ jobInstanceDao.queryJobInstanceListPaging(
+ new Page<>(pageNo, pageSize), startDate, endDate, null, syncTaskType);
+ }
+
+ List<SeaTunnelJobInstanceDto> records = jobInstanceIPage.getRecords();
+ if (CollUtil.isEmpty(records)) {
+ return result;
+ }
+ addJobDefineNameToResult(records);
+ addRunningTimeToResult(records);
+ jobPipelineSummaryMetrics(records, syncTaskType, userId);
+ pageInfo.setTotal((int) jobInstanceIPage.getTotal());
+ pageInfo.setTotalList(records);
+ result.setData(pageInfo);
+ return result;
+ }
+
+ private void addRunningTimeToResult(List<SeaTunnelJobInstanceDto> records) {
+ for (SeaTunnelJobInstanceDto jobInstanceDto : records) {
+ long runningTime = 0l;
+ Date createTime = jobInstanceDto.getCreateTime();
+ long createTimeSecond = createTime.toInstant().getEpochSecond();
+ Date endTime = jobInstanceDto.getEndTime();
+ if (endTime == null) {
+ Date currentData = new Date();
+ long currentDateSecond = currentData.toInstant().getEpochSecond();
+ runningTime = Math.abs(currentDateSecond - createTimeSecond);
+ jobInstanceDto.setRunningTime(runningTime);
+ } else {
+ long endTimeSecond = jobInstanceDto.getEndTime().toInstant().getEpochSecond();
+ runningTime = Math.abs(endTimeSecond - createTimeSecond);
+ jobInstanceDto.setRunningTime(runningTime);
+ }
+ }
+ }
+
+ private void addJobDefineNameToResult(List<SeaTunnelJobInstanceDto> records) {
+ for (SeaTunnelJobInstanceDto jobInstanceDto : records) {
+ JobDefinition jobDefinition =
+ jobDefinitionService.getJobDefinitionByJobId(jobInstanceDto.getJobDefineId());
+ jobInstanceDto.setJobDefineName(jobDefinition.getName());
+ }
+ }
+
+ public Date dateConverter(String time) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ try {
+ Date date = dateFormat.parse(time);
+ return date;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void jobPipelineSummaryMetrics(
+ List<SeaTunnelJobInstanceDto> records, String syncTaskType, Integer userId) {
+ try {
+ ArrayList<Long> jobInstanceIdList = new ArrayList<>();
+ HashMap<Long, Long> jobInstanceIdAndJobEngineIdMap = new HashMap<>();
+
+ for (SeaTunnelJobInstanceDto jobInstance : records) {
+ if (jobInstance.getId() != null && jobInstance.getJobEngineId() != null) {
+ jobInstanceIdList.add(jobInstance.getId());
+ jobInstanceIdAndJobEngineIdMap.put(
+ jobInstance.getId(), Long.valueOf(jobInstance.getJobEngineId()));
+ }
+ }
+
+ Map<Long, JobSummaryMetricsRes> jobSummaryMetrics =
+ jobMetricsService.getALLJobSummaryMetrics(
+ userId,
+ jobInstanceIdAndJobEngineIdMap,
+ jobInstanceIdList,
+ syncTaskType);
+
+ for (SeaTunnelJobInstanceDto taskInstance : records) {
+ if (jobSummaryMetrics.get(taskInstance.getId()) != null) {
+ taskInstance.setWriteRowCount(
+ jobSummaryMetrics.get(taskInstance.getId()).getWriteRowCount());
+ taskInstance.setReadRowCount(
+ jobSummaryMetrics.get(taskInstance.getId()).getReadRowCount());
+ }
+ }
+ } catch (Exception e) {
+ for (SeaTunnelJobInstanceDto taskInstance : records) {
+ log.error(
+ "instance {} {} set instance and engine id error", taskInstance.getId(), e);
+ }
+ }
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskServiceImpl.java
index 6d005982..4494df3c 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskServiceImpl.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/TaskServiceImpl.java
@@ -1,454 +1,460 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.app.service.impl;
-
-import org.apache.seatunnel.app.common.ObjectTypeEnum;
-import org.apache.seatunnel.app.common.ScriptStatusEnum;
-import org.apache.seatunnel.app.dal.dao.ISchedulerConfigDao;
-import org.apache.seatunnel.app.dal.dao.IScriptDao;
-import org.apache.seatunnel.app.dal.dao.IScriptJobApplyDao;
-import org.apache.seatunnel.app.dal.dao.IScriptParamDao;
-import org.apache.seatunnel.app.dal.entity.JobDefine;
-import org.apache.seatunnel.app.dal.entity.SchedulerConfig;
-import org.apache.seatunnel.app.dal.entity.Script;
-import org.apache.seatunnel.app.dal.entity.ScriptJobApply;
-import org.apache.seatunnel.app.dal.entity.ScriptParam;
-import org.apache.seatunnel.app.domain.dto.job.PushScriptDto;
-import org.apache.seatunnel.app.domain.dto.job.ScriptJobApplyDto;
-import org.apache.seatunnel.app.domain.request.task.ExecuteReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceListReq;
-import org.apache.seatunnel.app.domain.request.task.InstanceLogRes;
-import org.apache.seatunnel.app.domain.request.task.JobListReq;
-import org.apache.seatunnel.app.domain.request.task.RecycleScriptReq;
-import org.apache.seatunnel.app.domain.response.PageInfo;
-import org.apache.seatunnel.app.domain.response.task.InstanceSimpleInfoRes;
-import org.apache.seatunnel.app.domain.response.task.JobSimpleInfoRes;
-import org.apache.seatunnel.app.service.ITaskService;
-import org.apache.seatunnel.server.common.PageData;
-import org.apache.seatunnel.server.common.SeatunnelException;
-import org.apache.seatunnel.spi.scheduler.IInstanceService;
-import org.apache.seatunnel.spi.scheduler.IJobService;
-import org.apache.seatunnel.spi.scheduler.dto.ExecuteDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobListDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobSimpleInfoDto;
-import org.apache.seatunnel.spi.scheduler.dto.SchedulerConfigDto;
-import org.apache.seatunnel.spi.scheduler.enums.ExecuteTypeEnum;
-
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import com.cronutils.model.definition.CronDefinition;
-import com.cronutils.model.definition.CronDefinitionBuilder;
-import com.cronutils.model.time.ExecutionTime;
-import com.cronutils.parser.CronParser;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static com.cronutils.model.CronType.QUARTZ;
-import static java.util.Objects.requireNonNull;
-import static org.apache.seatunnel.app.common.ObjectTypeEnum.INSTANCE;
-import static org.apache.seatunnel.app.common.ObjectTypeEnum.JOB;
-import static org.apache.seatunnel.app.common.ObjectTypeEnum.SCRIPT;
-import static org.apache.seatunnel.server.common.Constants.UNDERLINE;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_ELEMENT;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_JOB;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_SCRIPT;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.SCHEDULER_CONFIG_NOT_EXIST;
-import static org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.NEVER_TRIGGER_EXPRESSION;
-import static org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.RETRY_INTERVAL_DEFAULT;
-import static org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.RETRY_TIMES_DEFAULT;
-
-@Component
-@Slf4j
-public class TaskServiceImpl implements ITaskService {
-
- @Resource private IJobService iJobService;
-
- @Resource private IInstanceService iInstanceService;
-
- @Resource private IScriptDao scriptDaoImpl;
-
- @Resource private IScriptParamDao scriptParamDaoImpl;
-
- @Resource private ISchedulerConfigDao schedulerConfigDaoImpl;
-
- @Resource private IScriptJobApplyDao scriptJobApplyDaoImpl;
-
- private Map<ObjectTypeEnum, Function<ExecuteReq, ExecuteDto>> executeFuncMap =
- Maps.newHashMapWithExpectedSize(ObjectTypeEnum.values().length);
-
- private static final CronDefinition CRON_DEFINITION =
- CronDefinitionBuilder.instanceDefinitionFor(QUARTZ);
-
- @PostConstruct
- public void initFuncMap() {
- executeFuncMap.put(SCRIPT, this::getExecuteDtoByScriptId);
- executeFuncMap.put(JOB, this::getExecuteDtoByJobId);
- executeFuncMap.put(INSTANCE, this::getExecuteDtoByInstanceId);
- }
-
- @Override
- public Long pushScriptToScheduler(PushScriptDto pushScriptDto) {
- final int scriptId = pushScriptDto.getScriptId();
- final int userId = pushScriptDto.getUserId();
-
- // check scheduler param
- SchedulerConfig config = schedulerConfigDaoImpl.getSchedulerConfig(scriptId);
- if (Objects.isNull(config)) {
- throw new SeatunnelException(SCHEDULER_CONFIG_NOT_EXIST);
- }
-
- final Script script = checkAndGetScript(scriptId);
- final List<ScriptParam> scriptParams = scriptParamDaoImpl.getParamsByScriptId(scriptId);
- Map<String, Object> params = getScriptParamMap(scriptParams);
-
- final SchedulerConfigDto schedulerConfigDto =
- SchedulerConfigDto.builder()
- .retryInterval(config.getRetryInterval())
- .retryTimes(config.getRetryTimes())
- .startTime(config.getActiveStartTime())
- .endTime(config.getActiveEndTime())
- .triggerExpression(config.getTriggerExpression())
- .build();
-
- final JobDto jobDto =
- JobDto.builder()
- .jobName(script.getName())
- .jobContent(script.getContent())
- .params(params)
- .operatorId(userId)
- .schedulerConfigDto(schedulerConfigDto)
- // todo fix to real execute script
- .executorScript(script.getContent())
- .jobId(null)
- .build();
-
- ScriptJobApply apply = scriptJobApplyDaoImpl.getByScriptId(script.getId());
- if (Objects.nonNull(apply)) {
- jobDto.setJobId(apply.getJobId());
- }
-
- // push script
- final long jobId = iJobService.submitJob(jobDto);
-
- // Use future to ensure that the page does not show exceptions due to database errors.
- syncScriptJobMapping(scriptId, userId, config.getId(), jobId);
-
- // Update script status
- script.setStatus((byte) ScriptStatusEnum.PUBLISHED.getCode());
- scriptDaoImpl.updateStatus(script);
- return jobId;
- }
-
- @Override
- public void recycleScriptFromScheduler(RecycleScriptReq req) {
- final ScriptJobApply apply =
- requireNonNull(
- scriptJobApplyDaoImpl.getByJobId(req.getJobId()), NO_SUCH_JOB::getTemplate);
-
- final Script script =
- requireNonNull(
- scriptDaoImpl.getScript(apply.getScriptId()), NO_SUCH_JOB::getTemplate);
-
- final JobDto jobDto =
- JobDto.builder()
- .jobId(apply.getJobId())
- .jobName(script.getName())
- .operatorId(req.getOperatorId())
- .build();
-
- iJobService.offlineJob(jobDto);
-
- syncScriptJobMapping(
- script.getId(),
- req.getOperatorId(),
- apply.getSchedulerConfigId(),
- apply.getJobId());
- }
-
- @Override
- public PageInfo<JobSimpleInfoRes> listJob(JobListReq req) {
- // Search from scheduler.
- final JobListDto dto =
- JobListDto.builder()
- .name(req.getName())
- .pageNo(req.getPageNo())
- .pageSize(req.getPageSize())
- .build();
- final PageData<JobSimpleInfoDto> jobPageData = iJobService.list(dto);
- final List<JobSimpleInfoRes> data =
- jobPageData.getData().stream().map(this::translate).collect(Collectors.toList());
-
- final PageInfo<JobSimpleInfoRes> pageInfo = new PageInfo<>();
-
- if (!CollectionUtils.isEmpty(data)) {
- final List<JobDefine> jobDefines =
- scriptJobApplyDaoImpl.selectJobDefineByJobIds(
- data.stream()
- .map(JobSimpleInfoRes::getJobId)
- .collect(Collectors.toList()));
- final Map<Long, JobDefine> mapping =
- jobDefines.stream()
- .collect(Collectors.toMap(JobDefine::getJobId, Function.identity()));
-
- data.forEach(
- d -> {
- final JobDefine jf = mapping.getOrDefault(d.getJobId(), new JobDefine());
- d.setJobPlan(jf.getTriggerExpression());
- d.setScriptId(jf.getScriptId());
- });
-
- pageInfo.setData(data);
- pageInfo.setPageNo(req.getPageNo());
- pageInfo.setPageSize(req.getPageSize());
- pageInfo.setTotalCount(jobPageData.getTotalCount());
- }
-
- return pageInfo;
- }
-
- @Override
- public PageInfo<InstanceSimpleInfoRes> listInstance(InstanceListReq req) {
- // Search from scheduler.
- final InstanceListDto dto =
- InstanceListDto.builder()
- .name(req.getName())
- .pageNo(req.getPageNo())
- .pageSize(req.getPageSize())
- .build();
- final PageData<InstanceDto> instancePageData = iInstanceService.list(dto);
- final List<InstanceSimpleInfoRes> data =
- instancePageData.getData().stream()
- .map(this::translate)
- .collect(Collectors.toList());
-
- if (!CollectionUtils.isEmpty(data)) {
- final List<JobDefine> jobDefines =
- scriptJobApplyDaoImpl.selectJobDefineByJobIds(
- data.stream()
- .map(InstanceSimpleInfoRes::getJobId)
- .collect(Collectors.toList()));
- final Map<Long, JobDefine> mapping =
- jobDefines.stream()
- .collect(Collectors.toMap(JobDefine::getJobId, Function.identity()));
-
- data.forEach(
- d -> {
- final JobDefine jobDefine = mapping.get(d.getJobId());
- CronParser parser = new CronParser(CRON_DEFINITION);
-
- if (Objects.nonNull(jobDefine)) {
- ExecutionTime executionTime =
- ExecutionTime.forCron(
- parser.parse(jobDefine.getTriggerExpression()));
- Optional<ZonedDateTime> nextExecution =
- executionTime.nextExecution(ZonedDateTime.now());
-
- if (nextExecution.isPresent()) {
- final ZonedDateTime next = nextExecution.get();
- d.setNextExecutionTime(Date.from(next.toInstant()));
- }
- }
- });
- }
-
- final PageInfo<InstanceSimpleInfoRes> pageInfo = new PageInfo<>();
- pageInfo.setData(data);
- pageInfo.setPageNo(req.getPageNo());
- pageInfo.setPageSize(req.getPageSize());
- pageInfo.setTotalCount(instancePageData.getTotalCount());
-
- return pageInfo;
- }
-
- @Override
- public InstanceSimpleInfoRes tmpExecute(ExecuteReq req) {
-
- final Integer objectType = req.getObjectType();
-
- final ObjectTypeEnum parse = ObjectTypeEnum.parse(objectType);
-
- final Function<ExecuteReq, ExecuteDto> executeFunc =
- Optional.ofNullable(executeFuncMap.get(parse))
- .orElseThrow(() -> new SeatunnelException(NO_SUCH_ELEMENT));
-
- final ExecuteDto dto = executeFunc.apply(req);
-
- return this.translate(iJobService.execute(dto));
- }
-
- private ExecuteDto getExecuteDtoByInstanceId(ExecuteReq req) {
- // objectId of instance is jobId
- return ExecuteDto.builder()
- .jobDto(JobDto.builder().jobId(req.getObjectId()).build())
- .executeTypeEnum(ExecuteTypeEnum.RERUN)
- .build();
- }
-
- private ExecuteDto getExecuteDtoByJobId(ExecuteReq req) {
- return ExecuteDto.builder()
- .jobDto(JobDto.builder().jobId(req.getObjectId()).build())
- .executeTypeEnum(ExecuteTypeEnum.parse(req.getExecuteType()))
- .build();
- }
-
- private ExecuteDto getExecuteDtoByScriptId(ExecuteReq req) {
- final Script script = checkAndGetScript(Math.toIntExact(req.getObjectId()));
-
- final SchedulerConfigDto schedulerConfigDto =
- SchedulerConfigDto.builder()
- .retryInterval(RETRY_INTERVAL_DEFAULT)
- .retryTimes(RETRY_TIMES_DEFAULT)
- .startTime(new Date())
- .endTime(new Date())
- .triggerExpression(NEVER_TRIGGER_EXPRESSION)
- .build();
-
- final JobDto jobDto =
- JobDto.builder()
- .jobName(
- script.getName()
- .concat(UNDERLINE)
- .concat(String.valueOf(System.currentTimeMillis())))
- .jobContent(req.getContent())
- .params(req.getParams())
- .operatorId(req.getOperatorId())
- .schedulerConfigDto(schedulerConfigDto)
- // todo fix to real execute script
- .executorScript(script.getContent())
- .jobId(null)
- .build();
-
- final ExecuteDto dto =
- ExecuteDto.builder()
- .jobDto(jobDto)
- .executeTypeEnum(ExecuteTypeEnum.parse(req.getExecuteType()))
- .complementDataDto(null)
- .build();
- return dto;
- }
-
- @Override
- public InstanceLogRes queryInstanceLog(Long instanceId) {
- final InstanceLogDto dto = iInstanceService.queryInstanceLog(instanceId);
-
- return InstanceLogRes.builder()
- .instanceId(instanceId)
- .logContent(dto.getLogContent())
- .build();
- }
-
- @Override
- public void kill(Long instanceId) {
- iJobService.kill(instanceId);
- }
-
- private JobSimpleInfoRes translate(JobSimpleInfoDto dto) {
- return JobSimpleInfoRes.builder()
- .jobId(dto.getJobId())
- .jobName(dto.getJobName())
- .jobStatus(dto.getJobStatus())
- .publish(dto.getPublish())
- .creatorName(dto.getCreatorName())
- .menderName(dto.getMenderName())
- .createTime(dto.getCreateTime())
- .updateTime(dto.getUpdateTime())
- .build();
- }
-
- private InstanceSimpleInfoRes translate(InstanceDto dto) {
- if (Objects.isNull(dto)) {
- return null;
- }
- return InstanceSimpleInfoRes.builder()
- .instanceId(dto.getInstanceId())
- .jobId(dto.getJobId())
- .instanceName(dto.getInstanceName())
- .submitTime(dto.getSubmitTime())
- .startTime(dto.getStartTime())
- .endTime(dto.getEndTime())
- .status(dto.getStatus())
- .executionDuration(dto.getExecutionDuration())
- .retryTimes(dto.getRetryTimes())
- .runFrequency(dto.getRunFrequency())
- .build();
- }
-
- private Script checkAndGetScript(int scriptId) {
- final Script script = scriptDaoImpl.getScript(scriptId);
- if (Objects.isNull(script)) {
- throw new SeatunnelException(NO_SUCH_SCRIPT);
- }
- return script;
- }
-
- private void syncScriptJobMapping(int scriptId, int userId, int schedulerConfigId, long jobId) {
- CompletableFuture.runAsync(
- () -> {
- // store script and job mapping
- final ScriptJobApplyDto dto =
- ScriptJobApplyDto.builder()
- .scriptId(scriptId)
- .schedulerConfigId(schedulerConfigId)
- .jobId(jobId)
- .userId(userId)
- .build();
- scriptJobApplyDaoImpl.insertOrUpdate(dto);
- })
- .whenComplete(
- (_return, e) -> {
- if (Objects.nonNull(e)) {
- log.error(
- "Store script and job mapping failed, please maintain this mapping manually. \n"
- + "scriptId [{}], schedulerConfigId [{}], jobId [{}], userId [{}]",
- scriptId,
- schedulerConfigId,
- jobId,
- userId,
- e);
- }
- });
- }
-
- private Map<String, Object> getScriptParamMap(List<ScriptParam> scriptParams) {
- Map<String, Object> params = Maps.newHashMap();
-
- if (!CollectionUtils.isEmpty(params)) {
- scriptParams.forEach(
- scriptParam -> params.put(scriptParam.getKey(), scriptParam.getValue()));
- }
- return params;
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.app.service.impl;
+//
+// import org.apache.seatunnel.app.common.ObjectTypeEnum;
+// import org.apache.seatunnel.app.common.ScriptStatusEnum;
+// import org.apache.seatunnel.app.dal.dao.ISchedulerConfigDao;
+// import org.apache.seatunnel.app.dal.dao.IScriptDao;
+// import org.apache.seatunnel.app.dal.dao.IScriptJobApplyDao;
+// import org.apache.seatunnel.app.dal.dao.IScriptParamDao;
+// import org.apache.seatunnel.app.dal.entity.JobDefine;
+// import org.apache.seatunnel.app.dal.entity.SchedulerConfig;
+// import org.apache.seatunnel.app.dal.entity.Script;
+// import org.apache.seatunnel.app.dal.entity.ScriptJobApply;
+// import org.apache.seatunnel.app.dal.entity.ScriptParam;
+// import org.apache.seatunnel.app.domain.dto.job.PushScriptDto;
+// import org.apache.seatunnel.app.domain.dto.job.ScriptJobApplyDto;
+// import org.apache.seatunnel.app.domain.request.task.ExecuteReq;
+// import org.apache.seatunnel.app.domain.request.task.InstanceListReq;
+// import org.apache.seatunnel.app.domain.request.task.InstanceLogRes;
+// import org.apache.seatunnel.app.domain.request.task.JobListReq;
+// import org.apache.seatunnel.app.domain.request.task.RecycleScriptReq;
+// import org.apache.seatunnel.app.domain.response.PageInfo;
+// import org.apache.seatunnel.app.domain.response.task.InstanceSimpleInfoRes;
+// import org.apache.seatunnel.app.domain.response.task.JobSimpleInfoRes;
+// import org.apache.seatunnel.app.service.ITaskService;
+// import org.apache.seatunnel.server.common.PageData;
+// import org.apache.seatunnel.server.common.SeatunnelException;
+// import org.apache.seatunnel.spi.scheduler.IInstanceService;
+// import org.apache.seatunnel.spi.scheduler.IJobService;
+// import org.apache.seatunnel.spi.scheduler.dto.ExecuteDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobListDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobSimpleInfoDto;
+// import org.apache.seatunnel.spi.scheduler.dto.SchedulerConfigDto;
+// import org.apache.seatunnel.spi.scheduler.enums.ExecuteTypeEnum;
+//
+// import org.springframework.stereotype.Component;
+// import org.springframework.util.CollectionUtils;
+//
+// import com.cronutils.model.definition.CronDefinition;
+// import com.cronutils.model.definition.CronDefinitionBuilder;
+// import com.cronutils.model.time.ExecutionTime;
+// import com.cronutils.parser.CronParser;
+// import com.google.common.collect.Maps;
+// import lombok.extern.slf4j.Slf4j;
+//
+// import javax.annotation.PostConstruct;
+// import javax.annotation.Resource;
+//
+// import java.time.ZonedDateTime;
+// import java.util.Date;
+// import java.util.List;
+// import java.util.Map;
+// import java.util.Objects;
+// import java.util.Optional;
+// import java.util.concurrent.CompletableFuture;
+// import java.util.function.Function;
+// import java.util.stream.Collectors;
+//
+// import static com.cronutils.model.CronType.QUARTZ;
+// import static java.util.Objects.requireNonNull;
+// import static org.apache.seatunnel.app.common.ObjectTypeEnum.INSTANCE;
+// import static org.apache.seatunnel.app.common.ObjectTypeEnum.JOB;
+// import static org.apache.seatunnel.app.common.ObjectTypeEnum.SCRIPT;
+// import static org.apache.seatunnel.server.common.Constants.UNDERLINE;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_ELEMENT;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_JOB;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_SUCH_SCRIPT;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.SCHEDULER_CONFIG_NOT_EXIST;
+// import static
+// org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.NEVER_TRIGGER_EXPRESSION;
+// import static
+// org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.RETRY_INTERVAL_DEFAULT;
+// import static org.apache.seatunnel.spi.scheduler.constants.SchedulerConstant.RETRY_TIMES_DEFAULT;
+//
+// @Component
+// @Slf4j
+// public class TaskServiceImpl implements ITaskService {
+//
+// @Resource private IJobService iJobService;
+//
+// @Resource private IInstanceService iInstanceService;
+//
+// @Resource private IScriptDao scriptDaoImpl;
+//
+// @Resource private IScriptParamDao scriptParamDaoImpl;
+//
+// @Resource private ISchedulerConfigDao schedulerConfigDaoImpl;
+//
+// @Resource private IScriptJobApplyDao scriptJobApplyDaoImpl;
+//
+// private Map<ObjectTypeEnum, Function<ExecuteReq, ExecuteDto>> executeFuncMap =
+// Maps.newHashMapWithExpectedSize(ObjectTypeEnum.values().length);
+//
+// private static final CronDefinition CRON_DEFINITION =
+// CronDefinitionBuilder.instanceDefinitionFor(QUARTZ);
+//
+// @PostConstruct
+// public void initFuncMap() {
+// executeFuncMap.put(SCRIPT, this::getExecuteDtoByScriptId);
+// executeFuncMap.put(JOB, this::getExecuteDtoByJobId);
+// executeFuncMap.put(INSTANCE, this::getExecuteDtoByInstanceId);
+// }
+//
+// @Override
+// public Long pushScriptToScheduler(PushScriptDto pushScriptDto) {
+// final int scriptId = pushScriptDto.getScriptId();
+// final int userId = pushScriptDto.getUserId();
+//
+// // check scheduler param
+// SchedulerConfig config = schedulerConfigDaoImpl.getSchedulerConfig(scriptId);
+// if (Objects.isNull(config)) {
+// throw new SeatunnelException(SCHEDULER_CONFIG_NOT_EXIST);
+// }
+//
+// final Script script = checkAndGetScript(scriptId);
+// final List<ScriptParam> scriptParams = scriptParamDaoImpl.getParamsByScriptId(scriptId);
+// Map<String, Object> params = getScriptParamMap(scriptParams);
+//
+// final SchedulerConfigDto schedulerConfigDto =
+// SchedulerConfigDto.builder()
+// .retryInterval(config.getRetryInterval())
+// .retryTimes(config.getRetryTimes())
+// .startTime(config.getActiveStartTime())
+// .endTime(config.getActiveEndTime())
+// .triggerExpression(config.getTriggerExpression())
+// .build();
+//
+// final JobDto jobDto =
+// JobDto.builder()
+// .jobName(script.getName())
+// .jobContent(script.getContent())
+// .params(params)
+// .operatorId(userId)
+// .schedulerConfigDto(schedulerConfigDto)
+// // todo fix to real execute script
+// .executorScript(script.getContent())
+// .jobId(null)
+// .build();
+//
+// ScriptJobApply apply = scriptJobApplyDaoImpl.getByScriptId(script.getId());
+// if (Objects.nonNull(apply)) {
+// jobDto.setJobId(apply.getJobId());
+// }
+//
+// // push script
+// final long jobId = iJobService.submitJob(jobDto);
+//
+// // Use future to ensure that the page does not show exceptions due to database errors.
+// syncScriptJobMapping(scriptId, userId, config.getId(), jobId);
+//
+// // Update script status
+// script.setStatus((byte) ScriptStatusEnum.PUBLISHED.getCode());
+// scriptDaoImpl.updateStatus(script);
+// return jobId;
+// }
+//
+// @Override
+// public void recycleScriptFromScheduler(RecycleScriptReq req) {
+// final ScriptJobApply apply =
+// requireNonNull(
+// scriptJobApplyDaoImpl.getByJobId(req.getJobId()),
+// NO_SUCH_JOB::getTemplate);
+//
+// final Script script =
+// requireNonNull(
+// scriptDaoImpl.getScript(apply.getScriptId()), NO_SUCH_JOB::getTemplate);
+//
+// final JobDto jobDto =
+// JobDto.builder()
+// .jobId(apply.getJobId())
+// .jobName(script.getName())
+// .operatorId(req.getOperatorId())
+// .build();
+//
+// iJobService.offlineJob(jobDto);
+//
+// syncScriptJobMapping(
+// script.getId(),
+// req.getOperatorId(),
+// apply.getSchedulerConfigId(),
+// apply.getJobId());
+// }
+//
+// @Override
+// public PageInfo<JobSimpleInfoRes> listJob(JobListReq req) {
+// // Search from scheduler.
+// final JobListDto dto =
+// JobListDto.builder()
+// .name(req.getName())
+// .pageNo(req.getPageNo())
+// .pageSize(req.getPageSize())
+// .build();
+// final PageData<JobSimpleInfoDto> jobPageData = iJobService.list(dto);
+// final List<JobSimpleInfoRes> data =
+// jobPageData.getData().stream().map(this::translate).collect(Collectors.toList());
+//
+// final PageInfo<JobSimpleInfoRes> pageInfo = new PageInfo<>();
+//
+// if (!CollectionUtils.isEmpty(data)) {
+// final List<JobDefine> jobDefines =
+// scriptJobApplyDaoImpl.selectJobDefineByJobIds(
+// data.stream()
+// .map(JobSimpleInfoRes::getJobId)
+// .collect(Collectors.toList()));
+// final Map<Long, JobDefine> mapping =
+// jobDefines.stream()
+// .collect(Collectors.toMap(JobDefine::getJobId, Function.identity()));
+//
+// data.forEach(
+// d -> {
+// final JobDefine jf = mapping.getOrDefault(d.getJobId(), new JobDefine());
+// d.setJobPlan(jf.getTriggerExpression());
+// d.setScriptId(jf.getScriptId());
+// });
+//
+// pageInfo.setData(data);
+// pageInfo.setPageNo(req.getPageNo());
+// pageInfo.setPageSize(req.getPageSize());
+// pageInfo.setTotalCount(jobPageData.getTotalCount());
+// }
+//
+// return pageInfo;
+// }
+//
+// @Override
+// public PageInfo<InstanceSimpleInfoRes> listInstance(InstanceListReq req) {
+// // Search from scheduler.
+// final InstanceListDto dto =
+// InstanceListDto.builder()
+// .name(req.getName())
+// .pageNo(req.getPageNo())
+// .pageSize(req.getPageSize())
+// .build();
+// final PageData<InstanceDto> instancePageData = iInstanceService.list(dto);
+// final List<InstanceSimpleInfoRes> data =
+// instancePageData.getData().stream()
+// .map(this::translate)
+// .collect(Collectors.toList());
+//
+// if (!CollectionUtils.isEmpty(data)) {
+// final List<JobDefine> jobDefines =
+// scriptJobApplyDaoImpl.selectJobDefineByJobIds(
+// data.stream()
+// .map(InstanceSimpleInfoRes::getJobId)
+// .collect(Collectors.toList()));
+// final Map<Long, JobDefine> mapping =
+// jobDefines.stream()
+// .collect(Collectors.toMap(JobDefine::getJobId, Function.identity()));
+//
+// data.forEach(
+// d -> {
+// final JobDefine jobDefine = mapping.get(d.getJobId());
+// CronParser parser = new CronParser(CRON_DEFINITION);
+//
+// if (Objects.nonNull(jobDefine)) {
+// ExecutionTime executionTime =
+// ExecutionTime.forCron(
+// parser.parse(jobDefine.getTriggerExpression()));
+// Optional<ZonedDateTime> nextExecution =
+// executionTime.nextExecution(ZonedDateTime.now());
+//
+// if (nextExecution.isPresent()) {
+// final ZonedDateTime next = nextExecution.get();
+// d.setNextExecutionTime(Date.from(next.toInstant()));
+// }
+// }
+// });
+// }
+//
+// final PageInfo<InstanceSimpleInfoRes> pageInfo = new PageInfo<>();
+// pageInfo.setData(data);
+// pageInfo.setPageNo(req.getPageNo());
+// pageInfo.setPageSize(req.getPageSize());
+// pageInfo.setTotalCount(instancePageData.getTotalCount());
+//
+// return pageInfo;
+// }
+//
+// @Override
+// public InstanceSimpleInfoRes tmpExecute(ExecuteReq req) {
+//
+// final Integer objectType = req.getObjectType();
+//
+// final ObjectTypeEnum parse = ObjectTypeEnum.parse(objectType);
+//
+// final Function<ExecuteReq, ExecuteDto> executeFunc =
+// Optional.ofNullable(executeFuncMap.get(parse))
+// .orElseThrow(() -> new SeatunnelException(NO_SUCH_ELEMENT));
+//
+// final ExecuteDto dto = executeFunc.apply(req);
+//
+// return this.translate(iJobService.execute(dto));
+// }
+//
+// private ExecuteDto getExecuteDtoByInstanceId(ExecuteReq req) {
+// // objectId of instance is jobId
+// return ExecuteDto.builder()
+// .jobDto(JobDto.builder().jobId(req.getObjectId()).build())
+// .executeTypeEnum(ExecuteTypeEnum.RERUN)
+// .build();
+// }
+//
+// private ExecuteDto getExecuteDtoByJobId(ExecuteReq req) {
+// return ExecuteDto.builder()
+// .jobDto(JobDto.builder().jobId(req.getObjectId()).build())
+// .executeTypeEnum(ExecuteTypeEnum.parse(req.getExecuteType()))
+// .build();
+// }
+//
+// private ExecuteDto getExecuteDtoByScriptId(ExecuteReq req) {
+// final Script script = checkAndGetScript(Math.toIntExact(req.getObjectId()));
+//
+// final SchedulerConfigDto schedulerConfigDto =
+// SchedulerConfigDto.builder()
+// .retryInterval(RETRY_INTERVAL_DEFAULT)
+// .retryTimes(RETRY_TIMES_DEFAULT)
+// .startTime(new Date())
+// .endTime(new Date())
+// .triggerExpression(NEVER_TRIGGER_EXPRESSION)
+// .build();
+//
+// final JobDto jobDto =
+// JobDto.builder()
+// .jobName(
+// script.getName()
+// .concat(UNDERLINE)
+// .concat(String.valueOf(System.currentTimeMillis())))
+// .jobContent(req.getContent())
+// .params(req.getParams())
+// .operatorId(req.getOperatorId())
+// .schedulerConfigDto(schedulerConfigDto)
+// // todo fix to real execute script
+// .executorScript(script.getContent())
+// .jobId(null)
+// .build();
+//
+// final ExecuteDto dto =
+// ExecuteDto.builder()
+// .jobDto(jobDto)
+// .executeTypeEnum(ExecuteTypeEnum.parse(req.getExecuteType()))
+// .complementDataDto(null)
+// .build();
+// return dto;
+// }
+//
+// @Override
+// public InstanceLogRes queryInstanceLog(Long instanceId) {
+// final InstanceLogDto dto = iInstanceService.queryInstanceLog(instanceId);
+//
+// return InstanceLogRes.builder()
+// .instanceId(instanceId)
+// .logContent(dto.getLogContent())
+// .build();
+// }
+//
+// @Override
+// public void kill(Long instanceId) {
+// iJobService.kill(instanceId);
+// }
+//
+// private JobSimpleInfoRes translate(JobSimpleInfoDto dto) {
+// return JobSimpleInfoRes.builder()
+// .jobId(dto.getJobId())
+// .jobName(dto.getJobName())
+// .jobStatus(dto.getJobStatus())
+// .publish(dto.getPublish())
+// .creatorName(dto.getCreatorName())
+// .menderName(dto.getMenderName())
+// .createTime(dto.getCreateTime())
+// .updateTime(dto.getUpdateTime())
+// .build();
+// }
+//
+// private InstanceSimpleInfoRes translate(InstanceDto dto) {
+// if (Objects.isNull(dto)) {
+// return null;
+// }
+// return InstanceSimpleInfoRes.builder()
+// .instanceId(dto.getInstanceId())
+// .jobId(dto.getJobId())
+// .instanceName(dto.getInstanceName())
+// .submitTime(dto.getSubmitTime())
+// .startTime(dto.getStartTime())
+// .endTime(dto.getEndTime())
+// .status(dto.getStatus())
+// .executionDuration(dto.getExecutionDuration())
+// .retryTimes(dto.getRetryTimes())
+// .runFrequency(dto.getRunFrequency())
+// .build();
+// }
+//
+// private Script checkAndGetScript(int scriptId) {
+// final Script script = scriptDaoImpl.getScript(scriptId);
+// if (Objects.isNull(script)) {
+// throw new SeatunnelException(NO_SUCH_SCRIPT);
+// }
+// return script;
+// }
+//
+// private void syncScriptJobMapping(int scriptId, int userId, int schedulerConfigId, long jobId)
+// {
+// CompletableFuture.runAsync(
+// () -> {
+// // store script and job mapping
+// final ScriptJobApplyDto dto =
+// ScriptJobApplyDto.builder()
+// .scriptId(scriptId)
+// .schedulerConfigId(schedulerConfigId)
+// .jobId(jobId)
+// .userId(userId)
+// .build();
+// scriptJobApplyDaoImpl.insertOrUpdate(dto);
+// })
+// .whenComplete(
+// (_return, e) -> {
+// if (Objects.nonNull(e)) {
+// log.error(
+// "Store script and job mapping failed, please maintain this
+// mapping manually. \n"
+// + "scriptId [{}], schedulerConfigId [{}], jobId
+// [{}], userId [{}]",
+// scriptId,
+// schedulerConfigId,
+// jobId,
+// userId,
+// e);
+// }
+// });
+// }
+//
+// private Map<String, Object> getScriptParamMap(List<ScriptParam> scriptParams) {
+// Map<String, Object> params = Maps.newHashMap();
+//
+// if (!CollectionUtils.isEmpty(params)) {
+// scriptParams.forEach(
+// scriptParam -> params.put(scriptParam.getKey(), scriptParam.getValue()));
+// }
+// return params;
+// }
+// }
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java
index 0f9ded49..150ed95f 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java
@@ -96,7 +96,7 @@ public abstract class BaseJdbcDataSourceConfigSwitcher extends AbstractDataSourc
if (pluginType.equals(PluginType.SINK)) {
connectorConfig =
connectorConfig.withValue(
- GENERATE_SINK_SQL, ConfigValueFactory.fromAnyRef(false));
+ GENERATE_SINK_SQL, ConfigValueFactory.fromAnyRef(true));
}
if (businessMode.equals(DATA_INTEGRATION)) {
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java
index bf3444ec..80faeccc 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java
@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,6 +45,7 @@ import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
+@Slf4j
/** Engine metrics extractor SeaTunnel Engine implement. */
public class SeaTunnelEngineMetricsExtractor implements IEngineMetricsExtractor {
@Getter @Setter private SeaTunnelEngineProxy seaTunnelEngineProxy;
@@ -263,6 +265,213 @@ public class SeaTunnelEngineMetricsExtractor implements IEngineMetricsExtractor
return zetaClusterMetrics;
}
+ @Override
+ public Map<Integer, JobMetrics> getMetricsByJobEngineIdRTMap(@NonNull String jobEngineId) {
+ LinkedHashMap<Integer, JobMetrics> metricsMap = new LinkedHashMap();
+
+ LinkedHashMap<Integer, String> jobPipelineStatus = getJobPipelineStatus(jobEngineId);
+ try {
+ String metricsContent = seaTunnelEngineProxy.getMetricsContent(jobEngineId);
+ if (StringUtils.isEmpty(metricsContent)) {
+ return new HashMap<>();
+ }
+
+ JsonNode jsonNode =
+ JsonUtils.stringToJsonNode(seaTunnelEngineProxy.getMetricsContent(jobEngineId));
+ JsonNode sourceReceivedCount = jsonNode.get("SourceReceivedCount");
+ if (sourceReceivedCount != null && sourceReceivedCount.isArray()) {
+ for (JsonNode node : sourceReceivedCount) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMap(
+ metricsMap, jobPipelineStatus, pipelineId);
+ currPipelineMetrics.setReadRowCount(
+ currPipelineMetrics.getReadRowCount() + node.get("value").asLong());
+ }
+ }
+
+ JsonNode sinkWriteCount = jsonNode.get("SinkWriteCount");
+ if (sinkWriteCount != null && sinkWriteCount.isArray()) {
+ for (JsonNode node : jsonNode.get("SinkWriteCount")) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMap(
+ metricsMap, jobPipelineStatus, pipelineId);
+ currPipelineMetrics.setWriteRowCount(
+ currPipelineMetrics.getWriteRowCount() + node.get("value").asLong());
+ }
+ }
+
+ JsonNode sinkWriteQPS = jsonNode.get("SinkWriteQPS");
+ if (sinkWriteQPS != null && sinkWriteQPS.isArray()) {
+ for (JsonNode node : jsonNode.get("SinkWriteQPS")) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMap(
+ metricsMap, jobPipelineStatus, pipelineId);
+ currPipelineMetrics.setWriteQps(
+ currPipelineMetrics.getWriteQps()
+ + (new Double(node.get("value").asDouble())).longValue());
+ }
+ }
+
+ JsonNode sourceReceivedQPS = jsonNode.get("SourceReceivedQPS");
+ if (sourceReceivedQPS != null && sourceReceivedQPS.isArray()) {
+ for (JsonNode node : jsonNode.get("SourceReceivedQPS")) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMap(
+ metricsMap, jobPipelineStatus, pipelineId);
+ currPipelineMetrics.setReadQps(
+ currPipelineMetrics.getReadQps()
+ + (new Double(node.get("value").asDouble())).longValue());
+ }
+ }
+
+ JsonNode cdcRecordEmitDelay = jsonNode.get("CDCRecordEmitDelay");
+ if (cdcRecordEmitDelay != null && cdcRecordEmitDelay.isArray()) {
+ Map<Integer, List<Long>> dataMap = new HashMap<>();
+ for (JsonNode node : jsonNode.get("CDCRecordEmitDelay")) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ long value = node.get("value").asLong();
+ dataMap.computeIfAbsent(pipelineId, n -> new ArrayList<>()).add(value);
+ }
+ dataMap.forEach(
+ (key, value) -> {
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMap(
+ metricsMap, jobPipelineStatus, key);
+ OptionalDouble average = value.stream().mapToDouble(a -> a).average();
+ currPipelineMetrics.setRecordDelay(
+ Double.valueOf(average.isPresent() ? average.getAsDouble() : 0)
+ .longValue());
+ });
+ }
+ } catch (JsonProcessingException e) {
+ throw new SeatunnelException(
+ SeatunnelErrorEnum.LOAD_ENGINE_METRICS_JSON_ERROR,
+ "SeaTunnel",
+ ExceptionUtils.getMessage(e));
+ }
+
+ return metricsMap;
+ }
+
+ @Override
+ public Map<Long, HashMap<Integer, JobMetrics>> getAllRunningJobMetrics() {
+ HashMap<Long, HashMap<Integer, JobMetrics>> allRunningJobMetricsHashMap = new HashMap<>();
+
+ try {
+ String allJobMetricsContent = seaTunnelEngineProxy.getAllRunningJobMetricsContent();
+ log.info("allJobMetricsContent={}", allJobMetricsContent);
+
+ if (StringUtils.isEmpty(allJobMetricsContent)) {
+ return new HashMap<>();
+ }
+ JsonNode jsonNode = JsonUtils.stringToJsonNode(allJobMetricsContent);
+ Iterator<JsonNode> iterator = jsonNode.iterator();
+ while (iterator.hasNext()) {
+ LinkedHashMap<Integer, JobMetrics> metricsMap = new LinkedHashMap();
+ JsonNode next = iterator.next();
+
+ log.info("test0707--next={}", next);
+
+ JsonNode sourceReceivedCount = next.get("metrics").get("SourceReceivedCount");
+ Long jobEngineId = 0L;
+ if (sourceReceivedCount != null && sourceReceivedCount.isArray()) {
+ for (JsonNode node : sourceReceivedCount) {
+ jobEngineId = node.get("tags").get("jobId").asLong();
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMapStatusRunning(metricsMap, pipelineId);
+ currPipelineMetrics.setReadRowCount(
+ currPipelineMetrics.getReadRowCount() + node.get("value").asLong());
+ }
+ }
+
+ JsonNode sinkWriteCount = next.get("metrics").get("SinkWriteCount");
+ if (sinkWriteCount != null && sinkWriteCount.isArray()) {
+ for (JsonNode node : sinkWriteCount) {
+ jobEngineId = node.get("tags").get("jobId").asLong();
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMapStatusRunning(metricsMap, pipelineId);
+ currPipelineMetrics.setWriteRowCount(
+ currPipelineMetrics.getWriteRowCount()
+ + node.get("value").asLong());
+ }
+ }
+
+ JsonNode sinkWriteQPS = next.get("metrics").get("SinkWriteQPS");
+ if (sinkWriteQPS != null && sinkWriteQPS.isArray()) {
+ for (JsonNode node : sinkWriteQPS) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMapStatusRunning(metricsMap, pipelineId);
+ currPipelineMetrics.setWriteQps(
+ currPipelineMetrics.getWriteQps()
+ + (new Double(node.get("value").asDouble())).longValue());
+ }
+ }
+
+ JsonNode sourceReceivedQPS = next.get("metrics").get("SourceReceivedQPS");
+ if (sourceReceivedQPS != null && sourceReceivedQPS.isArray()) {
+ for (JsonNode node : sourceReceivedQPS) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMapStatusRunning(metricsMap, pipelineId);
+ currPipelineMetrics.setReadQps(
+ currPipelineMetrics.getReadQps()
+ + (new Double(node.get("value").asDouble())).longValue());
+ }
+ }
+
+ JsonNode cdcRecordEmitDelay = next.get("metrics").get("CDCRecordEmitDelay");
+ if (cdcRecordEmitDelay != null && cdcRecordEmitDelay.isArray()) {
+ Map<Integer, List<Long>> dataMap = new HashMap<>();
+ for (JsonNode node : cdcRecordEmitDelay) {
+ Integer pipelineId = node.get("tags").get("pipelineId").asInt();
+ long value = node.get("value").asLong();
+ dataMap.computeIfAbsent(pipelineId, n -> new ArrayList<>()).add(value);
+ }
+ dataMap.forEach(
+ (key, value) -> {
+ JobMetrics currPipelineMetrics =
+ getOrCreatePipelineMetricsMapStatusRunning(metricsMap, key);
+ OptionalDouble average =
+ value.stream().mapToDouble(a -> a).average();
+ currPipelineMetrics.setRecordDelay(
+ Double.valueOf(
+ average.isPresent()
+ ? average.getAsDouble()
+ : 0)
+ .longValue());
+ });
+ }
+
+ log.info("jobEngineId={},metricsMap={}", jobEngineId, metricsMap);
+
+ allRunningJobMetricsHashMap.put(jobEngineId, metricsMap);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return allRunningJobMetricsHashMap;
+ }
+
+ private JobMetrics getOrCreatePipelineMetricsMapStatusRunning(
+ LinkedHashMap<Integer, JobMetrics> metricsMap, Integer pipelineId) {
+ JobMetrics currPipelineMetrics = metricsMap.get(pipelineId);
+ if (currPipelineMetrics == null) {
+ currPipelineMetrics = new JobMetrics();
+ currPipelineMetrics.setStatus("RUNNING");
+ currPipelineMetrics.setPipelineId(pipelineId);
+ metricsMap.put(pipelineId, currPipelineMetrics);
+ }
+ return currPipelineMetrics;
+ }
+
private JobMetrics getOrCreatePipelineMetricsMap(
LinkedHashMap<Integer, JobMetrics> metricsMap,
LinkedHashMap<Integer, String> jobPipelineStatus,
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineProxy.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineProxy.java
index 1641f5d9..9bd4cd46 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineProxy.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineProxy.java
@@ -17,13 +17,16 @@
package org.apache.seatunnel.app.thirdparty.engine;
import org.apache.seatunnel.engine.client.SeaTunnelClient;
+import org.apache.seatunnel.engine.client.job.JobClient;
import org.apache.seatunnel.engine.common.config.ConfigProvider;
+import org.apache.seatunnel.engine.common.config.JobConfig;
import org.apache.seatunnel.engine.core.job.JobDAGInfo;
import com.hazelcast.client.config.ClientConfig;
import lombok.NonNull;
import java.util.Map;
+import java.util.concurrent.ExecutionException;
public class SeaTunnelEngineProxy {
ClientConfig clientConfig = null;
@@ -84,4 +87,34 @@ public class SeaTunnelEngineProxy {
private static class SeaTunnelEngineProxyHolder {
private static final SeaTunnelEngineProxy INSTANCE = new SeaTunnelEngineProxy();
}
+
+ public String getAllRunningJobMetricsContent() {
+
+ SeaTunnelClient seaTunnelClient = new SeaTunnelClient(clientConfig);
+ try {
+ return seaTunnelClient.getJobClient().getRunningJobMetrics();
+ } finally {
+ seaTunnelClient.close();
+ }
+ }
+
+ public void pauseJob(String jobEngineId) {
+ SeaTunnelClient seaTunnelClient = new SeaTunnelClient(clientConfig);
+ JobClient jobClient = seaTunnelClient.getJobClient();
+ jobClient.savePointJob(Long.valueOf(jobEngineId));
+ }
+
+ public void restoreJob(
+ @NonNull String filePath, @NonNull Long jobInstanceId, @NonNull Long jobEngineId) {
+ SeaTunnelClient seaTunnelClient = new SeaTunnelClient(clientConfig);
+ JobConfig jobConfig = new JobConfig();
+ jobConfig.setName(jobInstanceId + "_job");
+ try {
+ seaTunnelClient.restoreExecutionContext(filePath, jobConfig, jobEngineId).execute();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/framework/SeaTunnelOptionRuleWrapper.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/framework/SeaTunnelOptionRuleWrapper.java
index e2d3d8ba..7a0bfb6e 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/framework/SeaTunnelOptionRuleWrapper.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/framework/SeaTunnelOptionRuleWrapper.java
@@ -34,6 +34,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import lombok.NonNull;
+import java.math.BigDecimal;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -288,6 +289,7 @@ public class SeaTunnelOptionRuleWrapper {
|| Float.class.equals(option.typeReference().getType())
|| Integer.class.equals(option.typeReference().getType())
|| Long.class.equals(option.typeReference().getType())
+ || BigDecimal.class.equals(option.typeReference().getType())
|| String.class.equals(option.typeReference().getType())) {
if (option.key().toLowerCase(Locale.ROOT).equals("password")) {
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/metrics/IEngineMetricsExtractor.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/metrics/IEngineMetricsExtractor.java
index f3d803c7..f14decb3 100644
--- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/metrics/IEngineMetricsExtractor.java
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/metrics/IEngineMetricsExtractor.java
@@ -21,6 +21,7 @@ import org.apache.seatunnel.app.dal.entity.JobMetrics;
import lombok.NonNull;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -41,4 +42,9 @@ public interface IEngineMetricsExtractor {
List<Map<String, String>> getClusterHealthMetrics();
String getJobStatus(@NonNull String jobEngineId);
+
+ /** Obtain all running task metrics in the engine cluster */
+ Map<Long, HashMap<Integer, JobMetrics>> getAllRunningJobMetrics();
+
+ Map<Integer, JobMetrics> getMetricsByJobEngineIdRTMap(@NonNull String jobEngineId);
}
diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/PageInfo.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/PageInfo.java
new file mode 100644
index 00000000..5a50d8da
--- /dev/null
+++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/PageInfo.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.app.utils;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * page info
+ *
+ * @param <T> model
+ */
+public class PageInfo<T> {
+
+ /** totalList */
+ @Schema(description = "CURRENT_PAGE_RECORDS")
+ private List<T> totalList = Collections.emptyList();
+
+ /** total */
+ @Schema(description = "TOTAL_RECORDS")
+ private Integer total = 0;
+
+ /** total Page */
+ @Schema(description = "TOTAL_PAGE")
+ private Integer totalPage;
+
+ /** page size */
+ @Schema(description = "PAGE_SIZE")
+ private Integer pageSize = 20;
+
+ /** current page */
+ @Schema(description = "CURRENT_PAGE")
+ private Integer currentPage = 0;
+
+ /** pageNo */
+ @Schema(description = "PAGE_NO")
+ private Integer pageNo;
+
+ public PageInfo() {}
+
+ public PageInfo(Integer currentPage, Integer pageSize) {
+ if (currentPage == null) {
+ currentPage = 1;
+ }
+ this.pageNo = (currentPage - 1) * pageSize;
+ this.pageSize = pageSize;
+ this.currentPage = currentPage;
+ }
+
+ public Integer getStart() {
+ return pageNo;
+ }
+
+ public void setStart(Integer start) {
+ this.pageNo = start;
+ }
+
+ public List<T> getTotalList() {
+ return totalList;
+ }
+
+ public void setTotalList(List<T> totalList) {
+ this.totalList = totalList;
+ }
+
+ public Integer getTotal() {
+ if (total == null) {
+ total = 0;
+ }
+ return total;
+ }
+
+ public void setTotal(Integer total) {
+ this.total = total;
+ }
+
+ public Integer getTotalPage() {
+ if (pageSize == null || pageSize == 0) {
+ pageSize = 7;
+ }
+ this.totalPage =
+ (this.total % this.pageSize) == 0
+ ? ((this.total / this.pageSize) == 0 ? 1 : (this.total / this.pageSize))
+ : (this.total / this.pageSize + 1);
+ return this.totalPage;
+ }
+
+ public void setTotalPage(Integer totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public Integer getPageSize() {
+ if (pageSize == null || pageSize == 0) {
+ pageSize = 7;
+ }
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getCurrentPage() {
+ if (currentPage == null || currentPage <= 0) {
+ this.currentPage = 1;
+ }
+ return currentPage;
+ }
+
+ public void setCurrentPage(Integer currentPage) {
+ this.currentPage = currentPage;
+ }
+}
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
index 3156d923..60c2ae11 100644
--- a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
+++ b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobInstanceMapper.xml
@@ -29,16 +29,27 @@
id
, `job_define_id`, `job_status`, `job_config`, `engine_name`, `engine_version`, `job_engine_id`
</sql>
- <insert id="insert" parameterType="org.apache.seatunnel.app.dal.entity.JobInstance">
- insert into `t_st_job_instance` (<include refid="Base_Column_List"/>, `create_user_id`, `update_user_id`)
- values (#{id,jdbcType=BIGINT},
- #{jobDefineId,jdbcType=BIGINT},
- #{jobStatus,jdbcType=VARCHAR},
- #{jobConfig,jdbcType=VARCHAR},
- #{engineName,jdbcType=VARCHAR},
- #{engineVersion,jdbcType=VARCHAR},
- #{jobEngineId,jdbcType=VARCHAR},
- #{createUserId,jdbcType=BIGINT},
- #{updateUserId,jdbcType=BIGINT})
- </insert>
+
+ <select id="queryJobInstanceListPaging" resultType="org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto">
+ SELECT *
+ FROM t_st_job_instance
+ <where>
+ <if test="startTime != null">
+ AND create_time <![CDATA[ >=]]> #{startTime}
+ </if>
+ <if test="endTime == null">
+ AND (end_time is null or end_time <![CDATA[ <=]]> #{endTime})
+ </if>
+ <if test="endTime != null">
+ AND (end_time <![CDATA[ <=]]> #{endTime} or end_time is null)
+ </if>
+ <if test="jobDefineId != null">
+ AND job_define_id = #{jobDefineId}
+ </if>
+ <if test="jobMode != null">
+ AND job_type = #{jobMode}
+ </if>
+ </where>
+ ORDER BY create_time DESC
+ </select>
</mapper>
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobMapper.xml b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobMapper.xml
index 73d91a2c..7f96f06f 100644
--- a/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobMapper.xml
+++ b/seatunnel-server/seatunnel-app/src/main/resources/org/apache/seatunnel/app/dal/mapper/JobMapper.xml
@@ -70,4 +70,15 @@
</where>
order by update_time desc
</select>
+
+ <select id="queryJob" resultType="org.apache.seatunnel.app.dal.entity.JobDefinition">
+ select
+ <include refid="Base_Column_List"/>, create_time, update_time
+ from t_st_job_definition
+ <where>
+ <if test="searchName!=null and searchName != ''">
+ and name LIKE concat('%', #{searchName}, '%')
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/IDolphinschedulerService.java b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/IDolphinschedulerService.java
index 830a156b..713c5d8f 100644
--- a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/IDolphinschedulerService.java
+++ b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/IDolphinschedulerService.java
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.scheduler.dolphinscheduler;
-
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListTaskInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ResourceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
-import org.apache.seatunnel.server.common.PageData;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobDto;
-
-import java.util.List;
-
-public interface IDolphinschedulerService {
-
- ProcessDefinitionDto createOrUpdateProcessDefinition(UpdateProcessDefinitionDto dto);
-
- PageData<ProcessDefinitionDto> listProcessDefinition(ListProcessDefinitionDto dto);
-
- ProcessDefinitionDto fetchProcessDefinitionByName(String processDefinitionName);
-
- void startProcessDefinition(StartProcessDefinitionDto dto);
-
- void updateProcessDefinitionState(
- long processDefinitionCode, String processDefinitionName, String state);
-
- SchedulerDto createOrUpdateSchedule(JobDto dto);
-
- List<SchedulerDto> listSchedule(long processDefinitionCode);
-
- void scheduleOnline(int scheduleId);
-
- void scheduleOffline(int scheduleId);
-
- List<Long> genTaskCodes(long projectCode, int num);
-
- ResourceDto createOrUpdateScriptContent(String resourceName, String content);
-
- PageData<TaskInstanceDto> listTaskInstance(ListTaskInstanceDto dto);
-
- void deleteProcessDefinition(long code);
-
- PageData<ProcessInstanceDto> listProcessInstance(ListProcessInstanceDto dto);
-
- InstanceLogDto queryInstanceLog(long instanceId);
-
- void killProcessInstance(long processInstanceId);
-
- void execute(long processInstanceId, ExecuteTypeEnum executeType);
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.scheduler.dolphinscheduler;
+//
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListTaskInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ResourceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
+// import org.apache.seatunnel.server.common.PageData;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobDto;
+//
+// import java.util.List;
+//
+// public interface IDolphinschedulerService {
+//
+// ProcessDefinitionDto createOrUpdateProcessDefinition(UpdateProcessDefinitionDto dto);
+//
+// PageData<ProcessDefinitionDto> listProcessDefinition(ListProcessDefinitionDto dto);
+//
+// ProcessDefinitionDto fetchProcessDefinitionByName(String processDefinitionName);
+//
+// void startProcessDefinition(StartProcessDefinitionDto dto);
+//
+// void updateProcessDefinitionState(
+// long processDefinitionCode, String processDefinitionName, String state);
+//
+// SchedulerDto createOrUpdateSchedule(JobDto dto);
+//
+// List<SchedulerDto> listSchedule(long processDefinitionCode);
+//
+// void scheduleOnline(int scheduleId);
+//
+// void scheduleOffline(int scheduleId);
+//
+// List<Long> genTaskCodes(long projectCode, int num);
+//
+// ResourceDto createOrUpdateScriptContent(String resourceName, String content);
+//
+// PageData<TaskInstanceDto> listTaskInstance(ListTaskInstanceDto dto);
+//
+// void deleteProcessDefinition(long code);
+//
+// PageData<ProcessInstanceDto> listProcessInstance(ListProcessInstanceDto dto);
+//
+// InstanceLogDto queryInstanceLog(long instanceId);
+//
+// void killProcessInstance(long processInstanceId);
+//
+// void execute(long processInstanceId, ExecuteTypeEnum executeType);
+// }
diff --git a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/DolphinschedulerServiceImpl.java b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/DolphinschedulerServiceImpl.java
index 3d6337d0..1551b2df 100644
--- a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/DolphinschedulerServiceImpl.java
+++ b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/DolphinschedulerServiceImpl.java
@@ -1,840 +1,946 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
-
-import org.apache.seatunnel.scheduler.dolphinscheduler.ExecuteTypeEnum;
-import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ConditionResult;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListTaskInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.LocalParam;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.LocationDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.OnlineCreateResourceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProjectDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ResourceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDescriptionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskParamDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskRelationDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.utils.HttpUtils;
-import org.apache.seatunnel.server.common.DateUtils;
-import org.apache.seatunnel.server.common.PageData;
-import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
-import org.apache.seatunnel.server.common.SeatunnelException;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobDto;
-
-import org.apache.commons.collections4.MapUtils;
-
-import org.jsoup.Connection;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CODE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CODE_SUCCESS;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CONDITION_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CREATE_PROCESS_DEFINITION;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CREATE_SCHEDULE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CRONTAB;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA_TOTAL;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA_TOTAL_LIST;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEFAULT_FILE_SUFFIX;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DELAY_TIME_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DELETE_PROCESS_DEFINITION;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEPENDENCE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DESCRIPTION_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.END_TIME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ENVIRONMENT_CODE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ENVIRONMENT_CODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXECUTE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXECUTE_TYPE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILED_NODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FLAG_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FULL_NAME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_NUM;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_NUM_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_TASK_CODE_LIST;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCAL_PARAMS_DIRECT_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCAL_PARAMS_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS_X_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS_Y_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_DETAIL;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_LIMIT_NUM;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_LIMIT_NUM_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_MESSAGE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_SKIP_LINE_NUM;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_SKIP_LINE_NUM_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.MSG;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ONLINE_CREATE_RESOURCE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.POST_TASK_VERSION_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PRE_TASK_CODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PRE_TASK_VERSION_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION_CODE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION_NAME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_LIST;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_NAME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_LIST_PAGING;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_PROCESS_DEFINITION_BY_NAME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_PROJECT_LIST_PAGING;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_RESOURCE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_SCHEDULE_LIST_PAGING;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_TASK_LIST_PAGING;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_OFFLINE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_ID_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_SEPARATOR;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE_CONTENT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE_SUFFIX_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_OFFLINE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_ONLINE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SEARCH_VAL;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.START_PROCESS_INSTANCE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.START_TIME;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SUCCESS_NODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SWITCH_RESULT_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_DEFINITION_JSON;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_INSTANCE_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_PRIORITY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_RELATION_JSON;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TENANT_CODE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_FLAG_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_NOTIFY_STRATEGY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEZONE_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEZONE_ID_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TOKEN;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.UPDATE_CONTENT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.VERSION_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WAIT_START_TIMEOUT_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.utils.HttpUtils.createParamMap;
-import static org.apache.seatunnel.server.common.Constants.BLANK_SPACE;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_MATCHED_PROJECT;
-import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.UNEXPECTED_RETURN_CODE;
-
-@Slf4j
-@Component
-public class DolphinschedulerServiceImpl implements IDolphinschedulerService, InitializingBean {
-
- @Value("${ds.api.prefix}")
- private String apiPrefix;
-
- @Value("${ds.api.token}")
- private String token;
-
- @Value("${ds.tenant.default}")
- private String defaultTenantName;
-
- @Value("${ds.project.default}")
- private String defaultProjectName;
-
- @Value("${ds.script.dir}")
- private String defaultScriptDir;
-
- private long defaultProjectCode;
-
- private static final ObjectMapper MAPPER = new ObjectMapper();
-
- static {
- MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- }
-
- @Override
- public void afterPropertiesSet() throws Exception {
- final ProjectDto projectDto = queryProjectCodeByName(defaultProjectName);
- defaultProjectCode = projectDto.getCode();
- }
-
- @Override
- public ProcessDefinitionDto createOrUpdateProcessDefinition(UpdateProcessDefinitionDto dto) {
- // gen task code
- final List<Long> taskCodes = genTaskCodes(defaultProjectCode, GEN_NUM_DEFAULT);
-
- // build taskDefinitionJson and taskRelationJson.
- final Long taskCode = taskCodes.get(0);
- List<TaskDefinitionDto> taskDefinitionJson =
- Collections.singletonList(
- buildTaskDefinitionJson(taskCode, dto.getTaskDescriptionDto()));
- List<TaskRelationDto> taskRelationJson =
- buildTaskRelationJson(taskCode, dto.getTaskDescriptionDto());
- List<LocationDto> locations = buildLocation(taskCodes);
-
- String url = apiPrefix.concat(String.format(CREATE_PROCESS_DEFINITION, defaultProjectCode));
- Connection.Method method = Connection.Method.POST;
- if (Objects.nonNull(dto.getProcessDefinitionCode())) {
- method = Connection.Method.PUT;
- url = url.concat(String.valueOf(dto.getProcessDefinitionCode()));
- // offline process
- updateProcessDefinitionState(
- dto.getProcessDefinitionCode(), dto.getName(), RELEASE_STATE_OFFLINE);
- }
-
- final Map<String, String> paramMap =
- createParamMap(
- LOCATIONS,
- locations,
- TASK_DEFINITION_JSON,
- this.objectToString(taskDefinitionJson),
- TASK_RELATION_JSON,
- this.objectToString(taskRelationJson),
- TENANT_CODE,
- defaultTenantName,
- PROCESS_DEFINITION_NAME,
- dto.getName());
-
- final Map result =
- HttpUtils.builder()
- .withUrl(url)
- .withMethod(method)
- .withData(paramMap)
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
-
- checkResult(result, false);
- final Map<String, Object> map = MapUtils.getMap(result, DATA);
- return mapToPojo(map, ProcessDefinitionDto.class);
- }
-
- @Override
- public PageData<ProcessDefinitionDto> listProcessDefinition(ListProcessDefinitionDto dto) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(QUERY_LIST_PAGING, defaultProjectCode)))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- SEARCH_VAL,
- dto.getName(),
- PAGE_NO,
- dto.getPageNo(),
- PAGE_SIZE,
- dto.getPageSize()))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- final Map map = MapUtils.getMap(result, DATA);
- final int total = MapUtils.getIntValue(map, DATA_TOTAL);
- final List<Map<String, Object>> processDefinitionList =
- (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
-
- if (CollectionUtils.isEmpty(processDefinitionList)) {
- return new PageData<>(total, Collections.emptyList());
- }
- final List<ProcessDefinitionDto> data =
- processDefinitionList.stream()
- .map(m -> this.mapToPojo(m, ProcessDefinitionDto.class))
- .collect(Collectors.toList());
-
- return new PageData<>(total, data);
- }
-
- @Override
- public ProcessDefinitionDto fetchProcessDefinitionByName(String processDefinitionName) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- QUERY_PROCESS_DEFINITION_BY_NAME,
- defaultProjectCode)))
- .withMethod(Connection.Method.GET)
- .withData(createParamMap(PROCESS_DEFINITION_NAME, processDefinitionName))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- final Map<String, Object> map =
- (Map<String, Object>) MapUtils.getMap(result, DATA).get(PROCESS_DEFINITION);
- return this.mapToPojo(map, ProcessDefinitionDto.class);
- }
-
- @Override
- public void startProcessDefinition(StartProcessDefinitionDto dto) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(START_PROCESS_INSTANCE, defaultProjectCode)))
- .withMethod(Connection.Method.POST)
- .withData(dto.toMap())
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- @Override
- public void updateProcessDefinitionState(
- long processDefinitionCode, String processDefinitionName, String state) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- RELEASE,
- defaultProjectCode,
- processDefinitionCode)))
- .withMethod(Connection.Method.POST)
- .withData(
- createParamMap(
- PROCESS_DEFINITION_NAME,
- processDefinitionName,
- RELEASE_STATE,
- state))
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- @Override
- public SchedulerDto createOrUpdateSchedule(JobDto dto) {
- final Map<String, Object> map = Maps.newHashMap();
- map.put(FAILURE_STRATEGY, FAILURE_STRATEGY_DEFAULT);
- map.put(WARNING_TYPE, WARNING_TYPE_DEFAULT);
- map.put(PROCESS_INSTANCE_PRIORITY, PROCESS_INSTANCE_PRIORITY_DEFAULT);
- map.put(WARNING_GROUP_ID, WARNING_GROUP_ID_DEFAULT);
- map.put(WORKER_GROUP, WORKER_GROUP_DEFAULT);
- map.put(ENVIRONMENT_CODE, ENVIRONMENT_CODE_DEFAULT);
- map.put(PROCESS_DEFINITION_CODE, dto.getJobId());
-
- final Map<String, Object> schedule = Maps.newHashMap();
- schedule.put(START_TIME, DateUtils.format(dto.getSchedulerConfigDto().getStartTime()));
- schedule.put(END_TIME, DateUtils.format(dto.getSchedulerConfigDto().getEndTime()));
- schedule.put(CRONTAB, dto.getSchedulerConfigDto().getTriggerExpression());
- schedule.put(TIMEZONE_ID, TIMEZONE_ID_DEFAULT);
-
- map.put(SCHEDULE, this.objectToString(schedule));
-
- String url = String.format(CREATE_SCHEDULE, defaultProjectCode);
-
- final List<SchedulerDto> schedulerDtos = listSchedule(dto.getJobId());
- boolean flag = false;
- if (!CollectionUtils.isEmpty(schedulerDtos)) {
- url = url.concat(String.valueOf(schedulerDtos.get(0).getId()));
- flag = true;
- }
-
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(url))
- .withData(translate(map))
- .withMethod(flag ? Connection.Method.PUT : Connection.Method.POST)
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- if (flag) {
- schedulerDtos.clear();
- schedulerDtos.addAll(listSchedule(dto.getJobId()));
- return schedulerDtos.get(0);
- }
-
- Map<String, Object> resultMap = MapUtils.getMap(result, DATA);
- return this.mapToPojo(resultMap, SchedulerDto.class);
- }
-
- @Override
- public List<SchedulerDto> listSchedule(long processDefinitionCode) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- QUERY_SCHEDULE_LIST_PAGING, defaultProjectCode)))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- PROCESS_DEFINITION_CODE,
- processDefinitionCode,
- PAGE_NO,
- PAGE_NO_DEFAULT,
- PAGE_SIZE,
- PAGE_SIZE_DEFAULT))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- final List<Map<String, Object>> scheduleList =
- (List<Map<String, Object>>) MapUtils.getMap(result, DATA).get(DATA_TOTAL_LIST);
- if (CollectionUtils.isEmpty(scheduleList)) {
- return Collections.emptyList();
- }
- return scheduleList.stream()
- .map(m -> this.mapToPojo(m, SchedulerDto.class))
- .collect(Collectors.toList());
- }
-
- @Override
- public void scheduleOnline(int scheduleId) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- SCHEDULE_ONLINE, defaultProjectCode, scheduleId)))
- .withMethod(Connection.Method.POST)
- .withData(createParamMap(SCHEDULE_ID, scheduleId))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- @Override
- public void scheduleOffline(int scheduleId) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- SCHEDULE_OFFLINE, defaultProjectCode, scheduleId)))
- .withMethod(Connection.Method.POST)
- .withData(createParamMap(SCHEDULE_ID, scheduleId))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- @Override
- public List<Long> genTaskCodes(long projectCode, int num) {
- final String url = String.format(GEN_TASK_CODE_LIST, projectCode);
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(url))
- .withMethod(Connection.Method.GET)
- .withData(createParamMap(GEN_NUM, num))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- return (List<Long>) result.get(DATA);
- }
-
- @Override
- public ResourceDto createOrUpdateScriptContent(String resourceName, String content) {
- // check resource exists
- final String fullName = defaultScriptDir.concat(RESOURCE_SEPARATOR.concat(resourceName));
- final ResourceDto parentResourceDto = getResourceDto(defaultScriptDir, RESOURCE_TYPE_FILE);
- if (Objects.isNull(parentResourceDto)) {
- throw new SeatunnelException(
- SeatunnelErrorEnum.NO_MATCHED_SCRIPT_SAVE_DIR, defaultScriptDir);
- }
- final ResourceDto dto =
- getResourceDto(fullName.concat(DEFAULT_FILE_SUFFIX), RESOURCE_TYPE_FILE);
- if (Objects.isNull(dto)) {
- final OnlineCreateResourceDto createDto =
- OnlineCreateResourceDto.builder()
- .type(RESOURCE_TYPE_FILE)
- .pid(parentResourceDto.getId())
- .fileName(resourceName)
- .currentDir(defaultScriptDir)
- .suffix(RESOURCE_TYPE_FILE_SUFFIX_DEFAULT)
- .content(content)
- .build();
- onlineCreateResource(createDto);
- return getResourceDto(fullName.concat(DEFAULT_FILE_SUFFIX), RESOURCE_TYPE_FILE);
- } else {
- updateContent(dto.getId(), content);
- return dto;
- }
- }
-
- @Override
- public PageData<TaskInstanceDto> listTaskInstance(ListTaskInstanceDto dto) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(QUERY_TASK_LIST_PAGING, defaultProjectCode)))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- PROCESS_INSTANCE_NAME,
- dto.getName(),
- PAGE_NO,
- dto.getPageNo(),
- PAGE_SIZE,
- dto.getPageSize()))
- .withToken(TOKEN, token)
- .execute(Map.class);
-
- checkResult(result, false);
- final Map map = MapUtils.getMap(result, DATA);
- final List<Map<String, Object>> taskInstanceList =
- (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
- final int total = MapUtils.getIntValue(map, DATA_TOTAL);
- if (CollectionUtils.isEmpty(taskInstanceList)) {
- return PageData.empty();
- }
-
- final List<TaskInstanceDto> data =
- taskInstanceList.stream()
- .map(m -> this.mapToPojo(m, TaskInstanceDto.class))
- .collect(Collectors.toList());
- return new PageData<>(total, data);
- }
-
- @Override
- public void deleteProcessDefinition(long code) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(
- DELETE_PROCESS_DEFINITION,
- defaultProjectCode,
- code)))
- .withMethod(Connection.Method.DELETE)
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- @Override
- public PageData<ProcessInstanceDto> listProcessInstance(ListProcessInstanceDto dto) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(PROCESS_INSTANCE_LIST, defaultProjectCode)))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- SEARCH_VAL,
- dto.getName(),
- PAGE_NO,
- dto.getPageNo(),
- PAGE_SIZE,
- dto.getPageSize()))
- .withToken(TOKEN, token)
- .execute(Map.class);
-
- final Map map = MapUtils.getMap(result, DATA);
- final List<Map<String, Object>> processInstanceList =
- (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
- final int total = MapUtils.getIntValue(map, DATA_TOTAL);
- if (CollectionUtils.isEmpty(processInstanceList)) {
- return PageData.empty();
- }
-
- final List<ProcessInstanceDto> data =
- processInstanceList.stream()
- .map(m -> this.mapToPojo(m, ProcessInstanceDto.class))
- .collect(Collectors.toList());
- return new PageData<>(total, data);
- }
-
- @Override
- public void killProcessInstance(long processInstanceId) {
- execute(processInstanceId, ExecuteTypeEnum.STOP);
- }
-
- @Override
- public InstanceLogDto queryInstanceLog(long instanceId) {
-
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(LOG_DETAIL))
- .withData(
- createParamMap(
- TASK_INSTANCE_ID,
- instanceId,
- LOG_SKIP_LINE_NUM,
- LOG_SKIP_LINE_NUM_DEFAULT,
- LOG_LIMIT_NUM,
- LOG_LIMIT_NUM_DEFAULT))
- .withMethod(Connection.Method.GET)
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- final Map map = MapUtils.getMap(result, DATA);
- final String logContent = MapUtils.getString(map, LOG_MESSAGE);
-
- return InstanceLogDto.builder().logContent(logContent).build();
- }
-
- private ProjectDto queryProjectCodeByName(String projectName) throws IOException {
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(QUERY_PROJECT_LIST_PAGING))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- SEARCH_VAL,
- projectName,
- PAGE_NO,
- PAGE_NO_DEFAULT,
- PAGE_SIZE,
- PAGE_SIZE_DEFAULT))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
-
- final List<Map<String, Object>> projectList =
- (List<Map<String, Object>>) MapUtils.getMap(result, DATA).get(DATA_TOTAL_LIST);
- final ProjectDto projectDto =
- projectList.stream()
- .map(m -> this.mapToPojo(m, ProjectDto.class))
- .filter(p -> p.getName().equalsIgnoreCase(projectName))
- .findAny()
- .orElse(null);
- if (Objects.isNull(projectDto)) {
- throw new SeatunnelException(NO_MATCHED_PROJECT, projectName);
- }
- return projectDto;
- }
-
- @Override
- public void execute(long processInstanceId, ExecuteTypeEnum executeType) {
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(String.format(EXECUTE, defaultProjectCode)))
- .withMethod(Connection.Method.POST)
- .withRequestBody(this.objectToString(null))
- .withData(
- createParamMap(
- PROCESS_INSTANCE_ID,
- processInstanceId,
- EXECUTE_TYPE,
- executeType.name()))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- private TaskDefinitionDto buildTaskDefinitionJson(
- Long taskCode, TaskDescriptionDto taskDescriptionDto) {
- final ResourceDto resourceDto =
- createOrUpdateScriptContent(
- taskDescriptionDto.getName(), taskDescriptionDto.getContent());
- final TaskDefinitionDto taskDefinitionDto = new TaskDefinitionDto();
- taskDefinitionDto.setCode(taskCode);
- taskDefinitionDto.setName(taskDescriptionDto.getName());
- taskDefinitionDto.setDescription(DESCRIPTION_DEFAULT);
- taskDefinitionDto.setTaskType(TASK_TYPE_DEFAULT);
-
- final TaskParamDto taskParamDto = new TaskParamDto();
-
- taskParamDto.setResourceList(Collections.singletonList(resourceDto));
-
- final List<LocalParam> localParams = getLocalParams(taskDescriptionDto);
- taskParamDto.setLocalParams(localParams);
- taskParamDto.setRawScript(taskDescriptionDto.getExecuteScript());
- taskParamDto.setDependence(DEPENDENCE_DEFAULT);
-
- final ConditionResult conditionResult = new ConditionResult();
- conditionResult.setSuccessNode(SUCCESS_NODE_DEFAULT);
- conditionResult.setFailedNode(FAILED_NODE_DEFAULT);
-
- taskParamDto.setConditionResult(conditionResult);
- taskParamDto.setWaitStartTimeout(WAIT_START_TIMEOUT_DEFAULT);
- taskParamDto.setSwitchResult(SWITCH_RESULT_DEFAULT);
-
- taskDefinitionDto.setTaskParams(taskParamDto);
- taskDefinitionDto.setFlag(FLAG_DEFAULT);
- taskDefinitionDto.setTaskPriority(TASK_PRIORITY_DEFAULT);
- taskDefinitionDto.setWorkerGroup(WORKER_GROUP_DEFAULT);
- taskDefinitionDto.setFailRetryTimes(taskDescriptionDto.getRetryTimes());
- taskDefinitionDto.setFailRetryInterval(taskDescriptionDto.getRetryInterval());
- taskDefinitionDto.setTimeoutFlag(TIMEOUT_FLAG_DEFAULT);
- taskDefinitionDto.setTimeoutNotifyStrategy(TIMEOUT_NOTIFY_STRATEGY_DEFAULT);
- taskDefinitionDto.setTimeout(TIMEOUT_DEFAULT);
- taskDefinitionDto.setDelayTime(DELAY_TIME_DEFAULT);
- taskDefinitionDto.setEnvironmentCode(ENVIRONMENT_CODE_DEFAULT);
- taskDefinitionDto.setVersion(VERSION_DEFAULT);
- return taskDefinitionDto;
- }
-
- private List<LocalParam> getLocalParams(TaskDescriptionDto taskDescriptionDto) {
- final Map<String, Object> params = taskDescriptionDto.getParams();
- if (CollectionUtils.isEmpty(params)) {
- return Collections.emptyList();
- }
- final List<LocalParam> localParams = Lists.newArrayListWithCapacity(params.size());
- params.forEach(
- (k, v) -> {
- final LocalParam localParam = new LocalParam();
- localParam.setProp(k);
- localParam.setDirect(LOCAL_PARAMS_DIRECT_DEFAULT);
- localParam.setType(LOCAL_PARAMS_TYPE_DEFAULT);
- localParam.setValue(v);
- localParams.add(localParam);
- });
- return localParams;
- }
-
- private List<TaskRelationDto> buildTaskRelationJson(
- Long taskCode, TaskDescriptionDto taskDescriptionDto) {
-
- final TaskRelationDto taskRelationDto = new TaskRelationDto();
- taskRelationDto.setName(BLANK_SPACE);
- taskRelationDto.setPreTaskCode(PRE_TASK_CODE_DEFAULT);
- taskRelationDto.setPreTaskVersion(PRE_TASK_VERSION_DEFAULT);
- taskRelationDto.setPostTaskCode(taskCode);
- taskRelationDto.setPostTaskVersion(POST_TASK_VERSION_DEFAULT);
- taskRelationDto.setConditionType(CONDITION_TYPE_DEFAULT);
- taskRelationDto.setConditionParams(null);
- return Collections.singletonList(taskRelationDto);
- }
-
- private List<LocationDto> buildLocation(List<Long> taskCode) {
- final List<LocationDto> locations = Lists.newArrayListWithCapacity(taskCode.size());
- for (int i = 0; i < taskCode.size(); i++) {
- final LocationDto locationDto = new LocationDto();
- locationDto.setTaskCode(taskCode.get(i));
- locationDto.setX(LOCATIONS_X_DEFAULT * i);
- locationDto.setY(LOCATIONS_Y_DEFAULT * i);
- locations.add(locationDto);
- }
- return locations;
- }
-
- private void updateContent(int id, String content) {
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(String.format(UPDATE_CONTENT, id)))
- .withMethod(Connection.Method.PUT)
- .withData(
- createParamMap(
- RESOURCE_ID, id, RESOURCE_TYPE_FILE_CONTENT, content))
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- private void onlineCreateResource(OnlineCreateResourceDto createDto) {
- final Map<String, Object> map = createDto.toMap();
- final Map result =
- HttpUtils.builder()
- .withUrl(apiPrefix.concat(ONLINE_CREATE_RESOURCE))
- .withMethod(Connection.Method.POST)
- .withData(translate(map))
- .withRequestBody(this.objectToString(null))
- .withToken(TOKEN, token)
- .execute(Map.class);
- checkResult(result, false);
- }
-
- private ResourceDto getResourceDto(String fullName, String fileType) {
- final Map result =
- HttpUtils.builder()
- .withUrl(
- apiPrefix.concat(
- String.format(QUERY_RESOURCE, RESOURCE_ID_DEFAULT)))
- .withMethod(Connection.Method.GET)
- .withData(
- createParamMap(
- FULL_NAME, fullName, RESOURCE_TYPE, RESOURCE_TYPE_FILE))
- .withToken(TOKEN, token)
- .execute(Map.class);
- final int code = checkResult(result, true);
- if (code != CODE_SUCCESS) {
- return null;
- }
- final Map<String, Object> map = MapUtils.getMap(result, DATA);
- return this.mapToPojo(map, ResourceDto.class);
- }
-
- private int checkResult(Map result, boolean ignore) {
- final int intValue = MapUtils.getIntValue(result, CODE, -1);
- if (!ignore && CODE_SUCCESS != intValue) {
- final String msg = MapUtils.getString(result, MSG);
- throw new SeatunnelException(UNEXPECTED_RETURN_CODE, intValue, msg);
- }
- return intValue;
- }
-
- private Map<String, String> translate(Map<String, Object> origin) {
- final HashMap<String, String> map = Maps.newHashMapWithExpectedSize(origin.size());
- origin.forEach((k, v) -> map.put(k, String.valueOf(v)));
- return map;
- }
-
- private <T> T mapToPojo(Map map, Class<T> pojo) {
- try {
- return MAPPER.readValue(MAPPER.writeValueAsString(map), pojo);
- } catch (JsonProcessingException e) {
- log.error("Map translate to Pojo failed.", e);
- throw new SeatunnelException(SeatunnelErrorEnum.JSON_TRANSFORM_FAILED);
- }
- }
-
- private String objectToString(Object o) {
- try {
- return MAPPER.writeValueAsString(o);
- } catch (JsonProcessingException e) {
- log.error("Map translate to Pojo failed.", e);
- throw new SeatunnelException(SeatunnelErrorEnum.JSON_TRANSFORM_FAILED);
- }
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
+//
+// import org.apache.seatunnel.scheduler.dolphinscheduler.ExecuteTypeEnum;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ConditionResult;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListTaskInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.LocalParam;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.LocationDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.OnlineCreateResourceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProjectDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ResourceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDescriptionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskParamDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskRelationDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.utils.HttpUtils;
+// import org.apache.seatunnel.server.common.DateUtils;
+// import org.apache.seatunnel.server.common.PageData;
+// import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
+// import org.apache.seatunnel.server.common.SeatunnelException;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobDto;
+//
+// import org.apache.commons.collections4.MapUtils;
+//
+// import org.jsoup.Connection;
+// import org.springframework.beans.factory.InitializingBean;
+// import org.springframework.beans.factory.annotation.Value;
+// import org.springframework.stereotype.Component;
+// import org.springframework.util.CollectionUtils;
+//
+// import com.fasterxml.jackson.core.JsonProcessingException;
+// import com.fasterxml.jackson.databind.DeserializationFeature;
+// import com.fasterxml.jackson.databind.ObjectMapper;
+// import com.google.common.collect.Lists;
+// import com.google.common.collect.Maps;
+// import lombok.extern.slf4j.Slf4j;
+//
+// import java.io.IOException;
+// import java.util.Collections;
+// import java.util.HashMap;
+// import java.util.List;
+// import java.util.Map;
+// import java.util.Objects;
+// import java.util.stream.Collectors;
+//
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CODE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CODE_SUCCESS;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CONDITION_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CREATE_PROCESS_DEFINITION;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CREATE_SCHEDULE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.CRONTAB;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA_TOTAL;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DATA_TOTAL_LIST;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEFAULT_FILE_SUFFIX;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DELAY_TIME_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DELETE_PROCESS_DEFINITION;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEPENDENCE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DESCRIPTION_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.END_TIME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ENVIRONMENT_CODE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ENVIRONMENT_CODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXECUTE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXECUTE_TYPE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILED_NODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FLAG_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FULL_NAME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_NUM;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_NUM_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.GEN_TASK_CODE_LIST;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCAL_PARAMS_DIRECT_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCAL_PARAMS_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS_X_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOCATIONS_Y_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_DETAIL;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_LIMIT_NUM;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_LIMIT_NUM_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_MESSAGE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_SKIP_LINE_NUM;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.LOG_SKIP_LINE_NUM_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.MSG;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.ONLINE_CREATE_RESOURCE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.POST_TASK_VERSION_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PRE_TASK_CODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PRE_TASK_VERSION_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION_CODE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_DEFINITION_NAME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_LIST;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_NAME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_LIST_PAGING;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_PROCESS_DEFINITION_BY_NAME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_PROJECT_LIST_PAGING;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_RESOURCE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_SCHEDULE_LIST_PAGING;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.QUERY_TASK_LIST_PAGING;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_OFFLINE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_ID_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_SEPARATOR;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE_CONTENT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RESOURCE_TYPE_FILE_SUFFIX_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_OFFLINE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SCHEDULE_ONLINE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SEARCH_VAL;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.START_PROCESS_INSTANCE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.START_TIME;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SUCCESS_NODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.SWITCH_RESULT_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_DEFINITION_JSON;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_INSTANCE_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_PRIORITY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_RELATION_JSON;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TENANT_CODE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_FLAG_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEOUT_NOTIFY_STRATEGY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEZONE_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TIMEZONE_ID_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TOKEN;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.UPDATE_CONTENT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.VERSION_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WAIT_START_TIMEOUT_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP_DEFAULT;
+// import static org.apache.seatunnel.scheduler.dolphinscheduler.utils.HttpUtils.createParamMap;
+// import static org.apache.seatunnel.server.common.Constants.BLANK_SPACE;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.NO_MATCHED_PROJECT;
+// import static org.apache.seatunnel.server.common.SeatunnelErrorEnum.UNEXPECTED_RETURN_CODE;
+//
+// @Slf4j
+// @Component
+// public class DolphinschedulerServiceImpl implements IDolphinschedulerService, InitializingBean {
+//
+// @Value("${ds.api.prefix}")
+// private String apiPrefix;
+//
+// @Value("${ds.api.token}")
+// private String token;
+//
+// @Value("${ds.tenant.default}")
+// private String defaultTenantName;
+//
+// @Value("${ds.project.default}")
+// private String defaultProjectName;
+//
+// @Value("${ds.script.dir}")
+// private String defaultScriptDir;
+//
+// private long defaultProjectCode;
+//
+// private static final ObjectMapper MAPPER = new ObjectMapper();
+//
+// static {
+// MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+// }
+//
+// @Override
+// public void afterPropertiesSet() throws Exception {
+// final ProjectDto projectDto = queryProjectCodeByName(defaultProjectName);
+// defaultProjectCode = projectDto.getCode();
+// }
+//
+// @Override
+// public ProcessDefinitionDto createOrUpdateProcessDefinition(UpdateProcessDefinitionDto dto) {
+// // gen task code
+// final List<Long> taskCodes = genTaskCodes(defaultProjectCode, GEN_NUM_DEFAULT);
+//
+// // build taskDefinitionJson and taskRelationJson.
+// final Long taskCode = taskCodes.get(0);
+// List<TaskDefinitionDto> taskDefinitionJson =
+// Collections.singletonList(
+// buildTaskDefinitionJson(taskCode, dto.getTaskDescriptionDto()));
+// List<TaskRelationDto> taskRelationJson =
+// buildTaskRelationJson(taskCode, dto.getTaskDescriptionDto());
+// List<LocationDto> locations = buildLocation(taskCodes);
+//
+// String url = apiPrefix.concat(String.format(CREATE_PROCESS_DEFINITION,
+// defaultProjectCode));
+// Connection.Method method = Connection.Method.POST;
+// if (Objects.nonNull(dto.getProcessDefinitionCode())) {
+// method = Connection.Method.PUT;
+// url = url.concat(String.valueOf(dto.getProcessDefinitionCode()));
+// // offline process
+// updateProcessDefinitionState(
+// dto.getProcessDefinitionCode(), dto.getName(), RELEASE_STATE_OFFLINE);
+// }
+//
+// final Map<String, String> paramMap =
+// createParamMap(
+// LOCATIONS,
+// locations,
+// TASK_DEFINITION_JSON,
+// this.objectToString(taskDefinitionJson),
+// TASK_RELATION_JSON,
+// this.objectToString(taskRelationJson),
+// TENANT_CODE,
+// defaultTenantName,
+// PROCESS_DEFINITION_NAME,
+// dto.getName());
+//
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(url)
+// .withMethod(method)
+// .withData(paramMap)
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+//
+// checkResult(result, false);
+// final Map<String, Object> map = MapUtils.getMap(result, DATA);
+// return mapToPojo(map, ProcessDefinitionDto.class);
+// }
+//
+// @Override
+// public PageData<ProcessDefinitionDto> listProcessDefinition(ListProcessDefinitionDto dto) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(QUERY_LIST_PAGING, defaultProjectCode)))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// SEARCH_VAL,
+// dto.getName(),
+// PAGE_NO,
+// dto.getPageNo(),
+// PAGE_SIZE,
+// dto.getPageSize()))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// final Map map = MapUtils.getMap(result, DATA);
+// final int total = MapUtils.getIntValue(map, DATA_TOTAL);
+// final List<Map<String, Object>> processDefinitionList =
+// (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
+//
+// if (CollectionUtils.isEmpty(processDefinitionList)) {
+// return new PageData<>(total, Collections.emptyList());
+// }
+// final List<ProcessDefinitionDto> data =
+// processDefinitionList.stream()
+// .map(m -> this.mapToPojo(m, ProcessDefinitionDto.class))
+// .collect(Collectors.toList());
+//
+// return new PageData<>(total, data);
+// }
+//
+// @Override
+// public ProcessDefinitionDto fetchProcessDefinitionByName(String processDefinitionName) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// QUERY_PROCESS_DEFINITION_BY_NAME,
+// defaultProjectCode)))
+// .withMethod(Connection.Method.GET)
+// .withData(createParamMap(PROCESS_DEFINITION_NAME, processDefinitionName))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// final Map<String, Object> map =
+// (Map<String, Object>) MapUtils.getMap(result, DATA).get(PROCESS_DEFINITION);
+// return this.mapToPojo(map, ProcessDefinitionDto.class);
+// }
+//
+// @Override
+// public void startProcessDefinition(StartProcessDefinitionDto dto) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(START_PROCESS_INSTANCE,
+// defaultProjectCode)))
+// .withMethod(Connection.Method.POST)
+// .withData(dto.toMap())
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// @Override
+// public void updateProcessDefinitionState(
+// long processDefinitionCode, String processDefinitionName, String state) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// RELEASE,
+// defaultProjectCode,
+// processDefinitionCode)))
+// .withMethod(Connection.Method.POST)
+// .withData(
+// createParamMap(
+// PROCESS_DEFINITION_NAME,
+// processDefinitionName,
+// RELEASE_STATE,
+// state))
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// @Override
+// public SchedulerDto createOrUpdateSchedule(JobDto dto) {
+// final Map<String, Object> map = Maps.newHashMap();
+// map.put(FAILURE_STRATEGY, FAILURE_STRATEGY_DEFAULT);
+// map.put(WARNING_TYPE, WARNING_TYPE_DEFAULT);
+// map.put(PROCESS_INSTANCE_PRIORITY, PROCESS_INSTANCE_PRIORITY_DEFAULT);
+// map.put(WARNING_GROUP_ID, WARNING_GROUP_ID_DEFAULT);
+// map.put(WORKER_GROUP, WORKER_GROUP_DEFAULT);
+// map.put(ENVIRONMENT_CODE, ENVIRONMENT_CODE_DEFAULT);
+// map.put(PROCESS_DEFINITION_CODE, dto.getJobId());
+//
+// final Map<String, Object> schedule = Maps.newHashMap();
+// schedule.put(START_TIME, DateUtils.format(dto.getSchedulerConfigDto().getStartTime()));
+// schedule.put(END_TIME, DateUtils.format(dto.getSchedulerConfigDto().getEndTime()));
+// schedule.put(CRONTAB, dto.getSchedulerConfigDto().getTriggerExpression());
+// schedule.put(TIMEZONE_ID, TIMEZONE_ID_DEFAULT);
+//
+// map.put(SCHEDULE, this.objectToString(schedule));
+//
+// String url = String.format(CREATE_SCHEDULE, defaultProjectCode);
+//
+// final List<SchedulerDto> schedulerDtos = listSchedule(dto.getJobId());
+// boolean flag = false;
+// if (!CollectionUtils.isEmpty(schedulerDtos)) {
+// url = url.concat(String.valueOf(schedulerDtos.get(0).getId()));
+// flag = true;
+// }
+//
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(url))
+// .withData(translate(map))
+// .withMethod(flag ? Connection.Method.PUT : Connection.Method.POST)
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// if (flag) {
+// schedulerDtos.clear();
+// schedulerDtos.addAll(listSchedule(dto.getJobId()));
+// return schedulerDtos.get(0);
+// }
+//
+// Map<String, Object> resultMap = MapUtils.getMap(result, DATA);
+// return this.mapToPojo(resultMap, SchedulerDto.class);
+// }
+//
+// @Override
+// public List<SchedulerDto> listSchedule(long processDefinitionCode) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// QUERY_SCHEDULE_LIST_PAGING, defaultProjectCode)))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// PROCESS_DEFINITION_CODE,
+// processDefinitionCode,
+// PAGE_NO,
+// PAGE_NO_DEFAULT,
+// PAGE_SIZE,
+// PAGE_SIZE_DEFAULT))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// final List<Map<String, Object>> scheduleList =
+// (List<Map<String, Object>>) MapUtils.getMap(result, DATA).get(DATA_TOTAL_LIST);
+// if (CollectionUtils.isEmpty(scheduleList)) {
+// return Collections.emptyList();
+// }
+// return scheduleList.stream()
+// .map(m -> this.mapToPojo(m, SchedulerDto.class))
+// .collect(Collectors.toList());
+// }
+//
+// @Override
+// public void scheduleOnline(int scheduleId) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// SCHEDULE_ONLINE, defaultProjectCode, scheduleId)))
+// .withMethod(Connection.Method.POST)
+// .withData(createParamMap(SCHEDULE_ID, scheduleId))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// @Override
+// public void scheduleOffline(int scheduleId) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// SCHEDULE_OFFLINE, defaultProjectCode,
+// scheduleId)))
+// .withMethod(Connection.Method.POST)
+// .withData(createParamMap(SCHEDULE_ID, scheduleId))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// @Override
+// public List<Long> genTaskCodes(long projectCode, int num) {
+// final String url = String.format(GEN_TASK_CODE_LIST, projectCode);
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(url))
+// .withMethod(Connection.Method.GET)
+// .withData(createParamMap(GEN_NUM, num))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// return (List<Long>) result.get(DATA);
+// }
+//
+// @Override
+// public ResourceDto createOrUpdateScriptContent(String resourceName, String content) {
+// // check resource exists
+// final String fullName = defaultScriptDir.concat(RESOURCE_SEPARATOR.concat(resourceName));
+// final ResourceDto parentResourceDto = getResourceDto(defaultScriptDir,
+// RESOURCE_TYPE_FILE);
+// if (Objects.isNull(parentResourceDto)) {
+// throw new SeatunnelException(
+// SeatunnelErrorEnum.NO_MATCHED_SCRIPT_SAVE_DIR, defaultScriptDir);
+// }
+// final ResourceDto dto =
+// getResourceDto(fullName.concat(DEFAULT_FILE_SUFFIX), RESOURCE_TYPE_FILE);
+// if (Objects.isNull(dto)) {
+// final OnlineCreateResourceDto createDto =
+// OnlineCreateResourceDto.builder()
+// .type(RESOURCE_TYPE_FILE)
+// .pid(parentResourceDto.getId())
+// .fileName(resourceName)
+// .currentDir(defaultScriptDir)
+// .suffix(RESOURCE_TYPE_FILE_SUFFIX_DEFAULT)
+// .content(content)
+// .build();
+// onlineCreateResource(createDto);
+// return getResourceDto(fullName.concat(DEFAULT_FILE_SUFFIX), RESOURCE_TYPE_FILE);
+// } else {
+// updateContent(dto.getId(), content);
+// return dto;
+// }
+// }
+//
+// @Override
+// public PageData<TaskInstanceDto> listTaskInstance(ListTaskInstanceDto dto) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(QUERY_TASK_LIST_PAGING,
+// defaultProjectCode)))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// PROCESS_INSTANCE_NAME,
+// dto.getName(),
+// PAGE_NO,
+// dto.getPageNo(),
+// PAGE_SIZE,
+// dto.getPageSize()))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+//
+// checkResult(result, false);
+// final Map map = MapUtils.getMap(result, DATA);
+// final List<Map<String, Object>> taskInstanceList =
+// (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
+// final int total = MapUtils.getIntValue(map, DATA_TOTAL);
+// if (CollectionUtils.isEmpty(taskInstanceList)) {
+// return PageData.empty();
+// }
+//
+// final List<TaskInstanceDto> data =
+// taskInstanceList.stream()
+// .map(m -> this.mapToPojo(m, TaskInstanceDto.class))
+// .collect(Collectors.toList());
+// return new PageData<>(total, data);
+// }
+//
+// @Override
+// public void deleteProcessDefinition(long code) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(
+// DELETE_PROCESS_DEFINITION,
+// defaultProjectCode,
+// code)))
+// .withMethod(Connection.Method.DELETE)
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// @Override
+// public PageData<ProcessInstanceDto> listProcessInstance(ListProcessInstanceDto dto) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(PROCESS_INSTANCE_LIST, defaultProjectCode)))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// SEARCH_VAL,
+// dto.getName(),
+// PAGE_NO,
+// dto.getPageNo(),
+// PAGE_SIZE,
+// dto.getPageSize()))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+//
+// final Map map = MapUtils.getMap(result, DATA);
+// final List<Map<String, Object>> processInstanceList =
+// (List<Map<String, Object>>) map.get(DATA_TOTAL_LIST);
+// final int total = MapUtils.getIntValue(map, DATA_TOTAL);
+// if (CollectionUtils.isEmpty(processInstanceList)) {
+// return PageData.empty();
+// }
+//
+// final List<ProcessInstanceDto> data =
+// processInstanceList.stream()
+// .map(m -> this.mapToPojo(m, ProcessInstanceDto.class))
+// .collect(Collectors.toList());
+// return new PageData<>(total, data);
+// }
+//
+// @Override
+// public void killProcessInstance(long processInstanceId) {
+// execute(processInstanceId, ExecuteTypeEnum.STOP);
+// }
+//
+// @Override
+// public InstanceLogDto queryInstanceLog(long instanceId) {
+//
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(LOG_DETAIL))
+// .withData(
+// createParamMap(
+// TASK_INSTANCE_ID,
+// instanceId,
+// LOG_SKIP_LINE_NUM,
+// LOG_SKIP_LINE_NUM_DEFAULT,
+// LOG_LIMIT_NUM,
+// LOG_LIMIT_NUM_DEFAULT))
+// .withMethod(Connection.Method.GET)
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// final Map map = MapUtils.getMap(result, DATA);
+// final String logContent = MapUtils.getString(map, LOG_MESSAGE);
+//
+// return InstanceLogDto.builder().logContent(logContent).build();
+// }
+//
+// private ProjectDto queryProjectCodeByName(String projectName) throws IOException {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(QUERY_PROJECT_LIST_PAGING))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// SEARCH_VAL,
+// projectName,
+// PAGE_NO,
+// PAGE_NO_DEFAULT,
+// PAGE_SIZE,
+// PAGE_SIZE_DEFAULT))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+//
+// final List<Map<String, Object>> projectList =
+// (List<Map<String, Object>>) MapUtils.getMap(result, DATA).get(DATA_TOTAL_LIST);
+// final ProjectDto projectDto =
+// projectList.stream()
+// .map(m -> this.mapToPojo(m, ProjectDto.class))
+// .filter(p -> p.getName().equalsIgnoreCase(projectName))
+// .findAny()
+// .orElse(null);
+// if (Objects.isNull(projectDto)) {
+// throw new SeatunnelException(NO_MATCHED_PROJECT, projectName);
+// }
+// return projectDto;
+// }
+//
+// @Override
+// public void execute(long processInstanceId, ExecuteTypeEnum executeType) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(String.format(EXECUTE, defaultProjectCode)))
+// .withMethod(Connection.Method.POST)
+// .withRequestBody(this.objectToString(null))
+// .withData(
+// createParamMap(
+// PROCESS_INSTANCE_ID,
+// processInstanceId,
+// EXECUTE_TYPE,
+// executeType.name()))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// private TaskDefinitionDto buildTaskDefinitionJson(
+// Long taskCode, TaskDescriptionDto taskDescriptionDto) {
+// final ResourceDto resourceDto =
+// createOrUpdateScriptContent(
+// taskDescriptionDto.getName(), taskDescriptionDto.getContent());
+// final TaskDefinitionDto taskDefinitionDto = new TaskDefinitionDto();
+// taskDefinitionDto.setCode(taskCode);
+// taskDefinitionDto.setName(taskDescriptionDto.getName());
+// taskDefinitionDto.setDescription(DESCRIPTION_DEFAULT);
+// taskDefinitionDto.setTaskType(TASK_TYPE_DEFAULT);
+//
+// final TaskParamDto taskParamDto = new TaskParamDto();
+//
+// taskParamDto.setResourceList(Collections.singletonList(resourceDto));
+//
+// final List<LocalParam> localParams = getLocalParams(taskDescriptionDto);
+// taskParamDto.setLocalParams(localParams);
+// taskParamDto.setRawScript(taskDescriptionDto.getExecuteScript());
+// taskParamDto.setDependence(DEPENDENCE_DEFAULT);
+//
+// final ConditionResult conditionResult = new ConditionResult();
+// conditionResult.setSuccessNode(SUCCESS_NODE_DEFAULT);
+// conditionResult.setFailedNode(FAILED_NODE_DEFAULT);
+//
+// taskParamDto.setConditionResult(conditionResult);
+// taskParamDto.setWaitStartTimeout(WAIT_START_TIMEOUT_DEFAULT);
+// taskParamDto.setSwitchResult(SWITCH_RESULT_DEFAULT);
+//
+// taskDefinitionDto.setTaskParams(taskParamDto);
+// taskDefinitionDto.setFlag(FLAG_DEFAULT);
+// taskDefinitionDto.setTaskPriority(TASK_PRIORITY_DEFAULT);
+// taskDefinitionDto.setWorkerGroup(WORKER_GROUP_DEFAULT);
+// taskDefinitionDto.setFailRetryTimes(taskDescriptionDto.getRetryTimes());
+// taskDefinitionDto.setFailRetryInterval(taskDescriptionDto.getRetryInterval());
+// taskDefinitionDto.setTimeoutFlag(TIMEOUT_FLAG_DEFAULT);
+// taskDefinitionDto.setTimeoutNotifyStrategy(TIMEOUT_NOTIFY_STRATEGY_DEFAULT);
+// taskDefinitionDto.setTimeout(TIMEOUT_DEFAULT);
+// taskDefinitionDto.setDelayTime(DELAY_TIME_DEFAULT);
+// taskDefinitionDto.setEnvironmentCode(ENVIRONMENT_CODE_DEFAULT);
+// taskDefinitionDto.setVersion(VERSION_DEFAULT);
+// return taskDefinitionDto;
+// }
+//
+// private List<LocalParam> getLocalParams(TaskDescriptionDto taskDescriptionDto) {
+// final Map<String, Object> params = taskDescriptionDto.getParams();
+// if (CollectionUtils.isEmpty(params)) {
+// return Collections.emptyList();
+// }
+// final List<LocalParam> localParams = Lists.newArrayListWithCapacity(params.size());
+// params.forEach(
+// (k, v) -> {
+// final LocalParam localParam = new LocalParam();
+// localParam.setProp(k);
+// localParam.setDirect(LOCAL_PARAMS_DIRECT_DEFAULT);
+// localParam.setType(LOCAL_PARAMS_TYPE_DEFAULT);
+// localParam.setValue(v);
+// localParams.add(localParam);
+// });
+// return localParams;
+// }
+//
+// private List<TaskRelationDto> buildTaskRelationJson(
+// Long taskCode, TaskDescriptionDto taskDescriptionDto) {
+//
+// final TaskRelationDto taskRelationDto = new TaskRelationDto();
+// taskRelationDto.setName(BLANK_SPACE);
+// taskRelationDto.setPreTaskCode(PRE_TASK_CODE_DEFAULT);
+// taskRelationDto.setPreTaskVersion(PRE_TASK_VERSION_DEFAULT);
+// taskRelationDto.setPostTaskCode(taskCode);
+// taskRelationDto.setPostTaskVersion(POST_TASK_VERSION_DEFAULT);
+// taskRelationDto.setConditionType(CONDITION_TYPE_DEFAULT);
+// taskRelationDto.setConditionParams(null);
+// return Collections.singletonList(taskRelationDto);
+// }
+//
+// private List<LocationDto> buildLocation(List<Long> taskCode) {
+// final List<LocationDto> locations = Lists.newArrayListWithCapacity(taskCode.size());
+// for (int i = 0; i < taskCode.size(); i++) {
+// final LocationDto locationDto = new LocationDto();
+// locationDto.setTaskCode(taskCode.get(i));
+// locationDto.setX(LOCATIONS_X_DEFAULT * i);
+// locationDto.setY(LOCATIONS_Y_DEFAULT * i);
+// locations.add(locationDto);
+// }
+// return locations;
+// }
+//
+// private void updateContent(int id, String content) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(String.format(UPDATE_CONTENT, id)))
+// .withMethod(Connection.Method.PUT)
+// .withData(
+// createParamMap(
+// RESOURCE_ID, id, RESOURCE_TYPE_FILE_CONTENT, content))
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// private void onlineCreateResource(OnlineCreateResourceDto createDto) {
+// final Map<String, Object> map = createDto.toMap();
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(apiPrefix.concat(ONLINE_CREATE_RESOURCE))
+// .withMethod(Connection.Method.POST)
+// .withData(translate(map))
+// .withRequestBody(this.objectToString(null))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// checkResult(result, false);
+// }
+//
+// private ResourceDto getResourceDto(String fullName, String fileType) {
+// final Map result =
+// HttpUtils.builder()
+// .withUrl(
+// apiPrefix.concat(
+// String.format(QUERY_RESOURCE, RESOURCE_ID_DEFAULT)))
+// .withMethod(Connection.Method.GET)
+// .withData(
+// createParamMap(
+// FULL_NAME, fullName, RESOURCE_TYPE, RESOURCE_TYPE_FILE))
+// .withToken(TOKEN, token)
+// .execute(Map.class);
+// final int code = checkResult(result, true);
+// if (code != CODE_SUCCESS) {
+// return null;
+// }
+// final Map<String, Object> map = MapUtils.getMap(result, DATA);
+// return this.mapToPojo(map, ResourceDto.class);
+// }
+//
+// private int checkResult(Map result, boolean ignore) {
+// final int intValue = MapUtils.getIntValue(result, CODE, -1);
+// if (!ignore && CODE_SUCCESS != intValue) {
+// final String msg = MapUtils.getString(result, MSG);
+// throw new SeatunnelException(UNEXPECTED_RETURN_CODE, intValue, msg);
+// }
+// return intValue;
+// }
+//
+// private Map<String, String> translate(Map<String, Object> origin) {
+// final HashMap<String, String> map = Maps.newHashMapWithExpectedSize(origin.size());
+// origin.forEach((k, v) -> map.put(k, String.valueOf(v)));
+// return map;
+// }
+//
+// private <T> T mapToPojo(Map map, Class<T> pojo) {
+// try {
+// return MAPPER.readValue(MAPPER.writeValueAsString(map), pojo);
+// } catch (JsonProcessingException e) {
+// log.error("Map translate to Pojo failed.", e);
+// throw new SeatunnelException(SeatunnelErrorEnum.JSON_TRANSFORM_FAILED);
+// }
+// }
+//
+// private String objectToString(Object o) {
+// try {
+// return MAPPER.writeValueAsString(o);
+// } catch (JsonProcessingException e) {
+// log.error("Map translate to Pojo failed.", e);
+// throw new SeatunnelException(SeatunnelErrorEnum.JSON_TRANSFORM_FAILED);
+// }
+// }
+// }
diff --git a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/InstanceServiceImpl.java b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/InstanceServiceImpl.java
index 749e35a8..48a1ec65 100644
--- a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/InstanceServiceImpl.java
+++ b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/InstanceServiceImpl.java
@@ -1,87 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
-
-import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.enums.RunFrequencyEnum;
-import org.apache.seatunnel.scheduler.dolphinscheduler.utils.StatusUtils;
-import org.apache.seatunnel.server.common.PageData;
-import org.apache.seatunnel.spi.scheduler.IInstanceService;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
-
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.Resource;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Component
-public class InstanceServiceImpl implements IInstanceService {
-
- @Resource private IDolphinschedulerService iDolphinschedulerService;
-
- @Override
- public PageData<InstanceDto> list(InstanceListDto dto) {
-
- final ListProcessInstanceDto listDto = new ListProcessInstanceDto();
- listDto.setName(dto.getName());
- listDto.setPageNo(dto.getPageNo());
- listDto.setPageSize(dto.getPageSize());
-
- // use list process instance instead of list task instance.
- final PageData<ProcessInstanceDto> instancePageData =
- iDolphinschedulerService.listProcessInstance(listDto);
-
- final List<InstanceDto> data =
- instancePageData.getData().stream()
- .map(
- t ->
- InstanceDto.builder()
- .instanceId(t.getId())
- .jobId(t.getProcessDefinitionCode())
- .instanceName(t.getName())
- .status(
- StatusUtils.getDolphinSchedulerStatus(
- t.getState())
- .name())
- .startTime(t.getStartTime())
- .endTime(t.getEndTime())
- .submitTime(t.getScheduleTime())
- .executionDuration(t.getDuration())
- .retryTimes(t.getRunTimes())
- .runFrequency(
- RunFrequencyEnum.parse(t.getCommandType())
- .name())
- .build())
- .collect(Collectors.toList());
- return new PageData<>(instancePageData.getTotalCount(), data);
- }
-
- @Override
- public InstanceLogDto queryInstanceLog(long instanceId) {
- return iDolphinschedulerService.queryInstanceLog(instanceId);
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
+//
+// import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessInstanceDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.enums.RunFrequencyEnum;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.utils.StatusUtils;
+// import org.apache.seatunnel.server.common.PageData;
+// import org.apache.seatunnel.spi.scheduler.IInstanceService;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceLogDto;
+//
+// import org.springframework.stereotype.Component;
+//
+// import lombok.extern.slf4j.Slf4j;
+//
+// import javax.annotation.Resource;
+//
+// import java.util.List;
+// import java.util.stream.Collectors;
+//
+// @Slf4j
+// @Component
+// public class InstanceServiceImpl implements IInstanceService {
+//
+// @Resource private IDolphinschedulerService iDolphinschedulerService;
+//
+// @Override
+// public PageData<InstanceDto> list(InstanceListDto dto) {
+//
+// final ListProcessInstanceDto listDto = new ListProcessInstanceDto();
+// listDto.setName(dto.getName());
+// listDto.setPageNo(dto.getPageNo());
+// listDto.setPageSize(dto.getPageSize());
+//
+// // use list process instance instead of list task instance.
+// final PageData<ProcessInstanceDto> instancePageData =
+// iDolphinschedulerService.listProcessInstance(listDto);
+//
+// final List<InstanceDto> data =
+// instancePageData.getData().stream()
+// .map(
+// t ->
+// InstanceDto.builder()
+// .instanceId(t.getId())
+// .jobId(t.getProcessDefinitionCode())
+// .instanceName(t.getName())
+// .status(
+// StatusUtils.getDolphinSchedulerStatus(
+// t.getState())
+// .name())
+// .startTime(t.getStartTime())
+// .endTime(t.getEndTime())
+// .submitTime(t.getScheduleTime())
+// .executionDuration(t.getDuration())
+// .retryTimes(t.getRunTimes())
+// .runFrequency(
+// RunFrequencyEnum.parse(t.getCommandType())
+// .name())
+// .build())
+// .collect(Collectors.toList());
+// return new PageData<>(instancePageData.getTotalCount(), data);
+// }
+//
+// @Override
+// public InstanceLogDto queryInstanceLog(long instanceId) {
+// return iDolphinschedulerService.queryInstanceLog(instanceId);
+// }
+// }
diff --git a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/JobServiceImpl.java b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/JobServiceImpl.java
index 423a96e1..2c8eaffc 100644
--- a/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/JobServiceImpl.java
+++ b/seatunnel-server/seatunnel-scheduler/seatunnel-scheduler-dolphinscheduler/src/main/java/org/apache/seatunnel/scheduler/dolphinscheduler/impl/JobServiceImpl.java
@@ -1,280 +1,301 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
-
-import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDescriptionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
-import org.apache.seatunnel.scheduler.dolphinscheduler.enums.ReleaseStateEnum;
-import org.apache.seatunnel.server.common.DateUtils;
-import org.apache.seatunnel.server.common.PageData;
-import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
-import org.apache.seatunnel.server.common.SeatunnelException;
-import org.apache.seatunnel.spi.scheduler.IInstanceService;
-import org.apache.seatunnel.spi.scheduler.IJobService;
-import org.apache.seatunnel.spi.scheduler.dto.ComplementDataDto;
-import org.apache.seatunnel.spi.scheduler.dto.ExecuteDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
-import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobListDto;
-import org.apache.seatunnel.spi.scheduler.dto.JobSimpleInfoDto;
-import org.apache.seatunnel.spi.scheduler.enums.ExecuteTypeEnum;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.Resource;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEPENDENT_MODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DRY_RUN;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXEC_TYPE_COMPLEMENT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXEC_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE_MIN;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_OFFLINE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_ONLINE;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RUN_MODE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RUN_MODE_PARALLEL;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_DEPEND_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE_DEFAULT;
-import static org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP_DEFAULT;
-import static org.apache.seatunnel.server.common.Constants.COMMA;
-import static org.apache.seatunnel.server.common.DateUtils.DEFAULT_DATETIME_FORMAT;
-
-@Component
-@Slf4j
-public class JobServiceImpl implements IJobService {
- @Resource private IDolphinschedulerService iDolphinschedulerService;
-
- @Resource private IInstanceService iInstanceService;
-
- @Value("${maxWaitingTimes:10}")
- private long maxWaitingTimes;
-
- @Value("${waitingSleepTime:100}")
- private long waitingSleepTime;
-
- @Override
- public long submitJob(JobDto dto) {
- // one process == one seatunnel script == one job
-
- final ProcessDefinitionDto processDefinition = getProcessDefinitionDto(dto);
-
- dto.setJobId(processDefinition.getCode());
- iDolphinschedulerService.updateProcessDefinitionState(
- processDefinition.getCode(), processDefinition.getName(), RELEASE_STATE_ONLINE);
- final SchedulerDto schedulerDto = iDolphinschedulerService.createOrUpdateSchedule(dto);
- iDolphinschedulerService.scheduleOnline(schedulerDto.getId());
-
- return processDefinition.getCode();
- }
-
- @Override
- public void offlineJob(JobDto dto) {
- iDolphinschedulerService.updateProcessDefinitionState(
- dto.getJobId(), dto.getJobName(), RELEASE_STATE_OFFLINE);
- }
-
- @Override
- public PageData<JobSimpleInfoDto> list(JobListDto dto) {
- final ListProcessDefinitionDto listDto = new ListProcessDefinitionDto();
- listDto.setName(dto.getName());
- listDto.setPageNo(dto.getPageNo());
- listDto.setPageSize(dto.getPageSize());
-
- final PageData<ProcessDefinitionDto> processPageData =
- iDolphinschedulerService.listProcessDefinition(listDto);
- final List<JobSimpleInfoDto> data =
- processPageData.getData().stream()
- .map(
- p ->
- JobSimpleInfoDto.builder()
- .jobId(p.getCode())
- .jobName(p.getName())
- .jobStatus(p.getReleaseState())
- .publish(
- ReleaseStateEnum.parse(p.getReleaseState())
- .isPublish())
- .createTime(p.getCreateTime())
- .updateTime(p.getUpdateTime())
- .creatorName(p.getUserName())
- .menderName(p.getModifyBy())
- .build())
- .collect(Collectors.toList());
- return new PageData<>(processPageData.getTotalCount(), data);
- }
-
- @Override
- @SuppressWarnings("magicnumber")
- public InstanceDto execute(ExecuteDto dto) {
-
- if (dto.getExecuteTypeEnum() == ExecuteTypeEnum.RERUN) {
- iDolphinschedulerService.execute(
- dto.getJobDto().getJobId(),
- org.apache.seatunnel.scheduler.dolphinscheduler.ExecuteTypeEnum.REPEAT_RUNNING);
- return null;
- }
-
- ProcessDefinitionDto processDefinition = null;
- final JobDto jobDto = dto.getJobDto();
- if (Objects.isNull(jobDto.getJobId())) {
- // need to create a temporary process definition and execute it.
- processDefinition = getProcessDefinitionDto(jobDto);
- jobDto.setJobId(processDefinition.getCode());
- iDolphinschedulerService.updateProcessDefinitionState(
- processDefinition.getCode(), processDefinition.getName(), RELEASE_STATE_ONLINE);
- }
-
- final ComplementDataDto complementDataDto = dto.getComplementDataDto();
- String execType;
- String runMode = RUN_MODE_DEFAULT;
-
- Date startTime = new Date();
- Date endTime = new Date();
- int parallelismNum = 1;
- if (Objects.isNull(complementDataDto)) {
- execType = EXEC_TYPE_DEFAULT;
- } else {
- execType = EXEC_TYPE_COMPLEMENT;
- if (Objects.nonNull(complementDataDto.getParallelismNum())) {
- runMode = RUN_MODE_PARALLEL;
- }
- startTime = complementDataDto.getStartTime();
- endTime = complementDataDto.getEndTime();
- parallelismNum = complementDataDto.getParallelismNum();
- }
-
- final StartProcessDefinitionDto startProcessDefinitionDto =
- StartProcessDefinitionDto.builder()
- .processDefinitionCode(jobDto.getJobId())
- .failureStrategy(FAILURE_STRATEGY_DEFAULT)
- .warningType(WARNING_TYPE_DEFAULT)
- .warningGroupId(WARNING_GROUP_ID_DEFAULT)
- .taskDependType(TASK_DEPEND_TYPE_DEFAULT)
- .runMode(runMode)
- .processInstancePriority(PROCESS_INSTANCE_PRIORITY_DEFAULT)
- .workerGroup(WORKER_GROUP_DEFAULT)
- .dryRun(DRY_RUN)
- .scheduleTime(
- DateUtils.format(startTime, DEFAULT_DATETIME_FORMAT)
- .concat(COMMA)
- .concat(DateUtils.format(endTime, DEFAULT_DATETIME_FORMAT)))
- .execType(execType)
- .dependentMode(DEPENDENT_MODE_DEFAULT)
- .expectedParallelismNumber(parallelismNum)
- .build();
- iDolphinschedulerService.startProcessDefinition(startProcessDefinitionDto);
-
- if (Objects.nonNull(processDefinition)) {
-
- final long code = processDefinition.getCode();
- final String name = processDefinition.getName();
-
- InstanceDto instanceDto = null;
- // waiting dolphinscheduler generate instance.
- for (int i = 0; i < maxWaitingTimes; i++) {
- // get instance by process definition name
- final InstanceListDto instanceListDto =
- InstanceListDto.builder()
- .pageNo(PAGE_NO_DEFAULT)
- .pageSize(PAGE_SIZE_MIN)
- .name(processDefinition.getName())
- .build();
- final PageData<InstanceDto> instancePageData =
- iInstanceService.list(instanceListDto);
- if (!CollectionUtils.isEmpty(instancePageData.getData())) {
- instanceDto = instancePageData.getData().get(0);
- break;
- }
- try {
- Thread.sleep(waitingSleepTime);
- } catch (InterruptedException e) {
- log.error("waiting for getting instance failed", e);
- throw new SeatunnelException(SeatunnelErrorEnum.GET_INSTANCE_FAILED);
- }
- }
-
- CompletableFuture.runAsync(
- () -> {
- // offline temporary process definition
- iDolphinschedulerService.updateProcessDefinitionState(
- code, name, RELEASE_STATE_OFFLINE);
- })
- .whenComplete(
- (_return, e) -> {
- if (Objects.nonNull(e)) {
- log.error(
- "clear temporary process definition failed, process definition code is [{}], name is [{}]",
- code,
- name,
- e);
- }
- });
- return instanceDto;
-
- } else {
- return null;
- }
- }
-
- @Override
- public void kill(Long instanceId) {
- iDolphinschedulerService.killProcessInstance(instanceId);
- }
-
- private ProcessDefinitionDto getProcessDefinitionDto(JobDto dto) {
- final TaskDescriptionDto taskDescriptionDto =
- TaskDescriptionDto.builder()
- .name(dto.getJobName())
- .executeScript(dto.getExecutorScript())
- .content(dto.getJobContent())
- .params(dto.getParams())
- .retryInterval(dto.getSchedulerConfigDto().getRetryInterval())
- .retryTimes(dto.getSchedulerConfigDto().getRetryTimes())
- .build();
-
- final UpdateProcessDefinitionDto processDto =
- UpdateProcessDefinitionDto.builder()
- .name(dto.getJobName())
- .startTime(dto.getSchedulerConfigDto().getStartTime())
- .endTime(dto.getSchedulerConfigDto().getEndTime())
- .cronExpression(dto.getSchedulerConfigDto().getTriggerExpression())
- .taskDescriptionDto(taskDescriptionDto)
- .processDefinitionCode(dto.getJobId())
- .build();
-
- return iDolphinschedulerService.createOrUpdateProcessDefinition(processDto);
- }
-}
+/// *
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+// package org.apache.seatunnel.scheduler.dolphinscheduler.impl;
+//
+// import org.apache.seatunnel.scheduler.dolphinscheduler.IDolphinschedulerService;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ListProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.ProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.SchedulerDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.StartProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.TaskDescriptionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.dto.UpdateProcessDefinitionDto;
+// import org.apache.seatunnel.scheduler.dolphinscheduler.enums.ReleaseStateEnum;
+// import org.apache.seatunnel.server.common.DateUtils;
+// import org.apache.seatunnel.server.common.PageData;
+// import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
+// import org.apache.seatunnel.server.common.SeatunnelException;
+// import org.apache.seatunnel.spi.scheduler.IInstanceService;
+// import org.apache.seatunnel.spi.scheduler.IJobService;
+// import org.apache.seatunnel.spi.scheduler.dto.ComplementDataDto;
+// import org.apache.seatunnel.spi.scheduler.dto.ExecuteDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceDto;
+// import org.apache.seatunnel.spi.scheduler.dto.InstanceListDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobListDto;
+// import org.apache.seatunnel.spi.scheduler.dto.JobSimpleInfoDto;
+// import org.apache.seatunnel.spi.scheduler.enums.ExecuteTypeEnum;
+//
+// import org.springframework.beans.factory.annotation.Value;
+// import org.springframework.stereotype.Component;
+// import org.springframework.util.CollectionUtils;
+//
+// import lombok.extern.slf4j.Slf4j;
+//
+// import javax.annotation.Resource;
+//
+// import java.util.Date;
+// import java.util.List;
+// import java.util.Objects;
+// import java.util.concurrent.CompletableFuture;
+// import java.util.stream.Collectors;
+//
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DEPENDENT_MODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.DRY_RUN;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXEC_TYPE_COMPLEMENT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.EXEC_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.FAILURE_STRATEGY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_NO_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PAGE_SIZE_MIN;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.PROCESS_INSTANCE_PRIORITY_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_OFFLINE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RELEASE_STATE_ONLINE;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RUN_MODE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.RUN_MODE_PARALLEL;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.TASK_DEPEND_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_GROUP_ID_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WARNING_TYPE_DEFAULT;
+// import static
+// org.apache.seatunnel.scheduler.dolphinscheduler.constants.DolphinschedulerConstants.WORKER_GROUP_DEFAULT;
+// import static org.apache.seatunnel.server.common.Constants.COMMA;
+// import static org.apache.seatunnel.server.common.DateUtils.DEFAULT_DATETIME_FORMAT;
+//
+// @Component
+// @Slf4j
+// public class JobServiceImpl implements IJobService {
+// @Resource private IDolphinschedulerService iDolphinschedulerService;
+//
+// @Resource private IInstanceService iInstanceService;
+//
+// @Value("${maxWaitingTimes:10}")
+// private long maxWaitingTimes;
+//
+// @Value("${waitingSleepTime:100}")
+// private long waitingSleepTime;
+//
+// @Override
+// public long submitJob(JobDto dto) {
+// // one process == one seatunnel script == one job
+//
+// final ProcessDefinitionDto processDefinition = getProcessDefinitionDto(dto);
+//
+// dto.setJobId(processDefinition.getCode());
+// iDolphinschedulerService.updateProcessDefinitionState(
+// processDefinition.getCode(), processDefinition.getName(), RELEASE_STATE_ONLINE);
+// final SchedulerDto schedulerDto = iDolphinschedulerService.createOrUpdateSchedule(dto);
+// iDolphinschedulerService.scheduleOnline(schedulerDto.getId());
+//
+// return processDefinition.getCode();
+// }
+//
+// @Override
+// public void offlineJob(JobDto dto) {
+// iDolphinschedulerService.updateProcessDefinitionState(
+// dto.getJobId(), dto.getJobName(), RELEASE_STATE_OFFLINE);
+// }
+//
+// @Override
+// public PageData<JobSimpleInfoDto> list(JobListDto dto) {
+// final ListProcessDefinitionDto listDto = new ListProcessDefinitionDto();
+// listDto.setName(dto.getName());
+// listDto.setPageNo(dto.getPageNo());
+// listDto.setPageSize(dto.getPageSize());
+//
+// final PageData<ProcessDefinitionDto> processPageData =
+// iDolphinschedulerService.listProcessDefinition(listDto);
+// final List<JobSimpleInfoDto> data =
+// processPageData.getData().stream()
+// .map(
+// p ->
+// JobSimpleInfoDto.builder()
+// .jobId(p.getCode())
+// .jobName(p.getName())
+// .jobStatus(p.getReleaseState())
+// .publish(
+//
+// ReleaseStateEnum.parse(p.getReleaseState())
+// .isPublish())
+// .createTime(p.getCreateTime())
+// .updateTime(p.getUpdateTime())
+// .creatorName(p.getUserName())
+// .menderName(p.getModifyBy())
+// .build())
+// .collect(Collectors.toList());
+// return new PageData<>(processPageData.getTotalCount(), data);
+// }
+//
+// @Override
+// @SuppressWarnings("magicnumber")
+// public InstanceDto execute(ExecuteDto dto) {
+//
+// if (dto.getExecuteTypeEnum() == ExecuteTypeEnum.RERUN) {
+// iDolphinschedulerService.execute(
+// dto.getJobDto().getJobId(),
+//
+// org.apache.seatunnel.scheduler.dolphinscheduler.ExecuteTypeEnum.REPEAT_RUNNING);
+// return null;
+// }
+//
+// ProcessDefinitionDto processDefinition = null;
+// final JobDto jobDto = dto.getJobDto();
+// if (Objects.isNull(jobDto.getJobId())) {
+// // need to create a temporary process definition and execute it.
+// processDefinition = getProcessDefinitionDto(jobDto);
+// jobDto.setJobId(processDefinition.getCode());
+// iDolphinschedulerService.updateProcessDefinitionState(
+// processDefinition.getCode(), processDefinition.getName(),
+// RELEASE_STATE_ONLINE);
+// }
+//
+// final ComplementDataDto complementDataDto = dto.getComplementDataDto();
+// String execType;
+// String runMode = RUN_MODE_DEFAULT;
+//
+// Date startTime = new Date();
+// Date endTime = new Date();
+// int parallelismNum = 1;
+// if (Objects.isNull(complementDataDto)) {
+// execType = EXEC_TYPE_DEFAULT;
+// } else {
+// execType = EXEC_TYPE_COMPLEMENT;
+// if (Objects.nonNull(complementDataDto.getParallelismNum())) {
+// runMode = RUN_MODE_PARALLEL;
+// }
+// startTime = complementDataDto.getStartTime();
+// endTime = complementDataDto.getEndTime();
+// parallelismNum = complementDataDto.getParallelismNum();
+// }
+//
+// final StartProcessDefinitionDto startProcessDefinitionDto =
+// StartProcessDefinitionDto.builder()
+// .processDefinitionCode(jobDto.getJobId())
+// .failureStrategy(FAILURE_STRATEGY_DEFAULT)
+// .warningType(WARNING_TYPE_DEFAULT)
+// .warningGroupId(WARNING_GROUP_ID_DEFAULT)
+// .taskDependType(TASK_DEPEND_TYPE_DEFAULT)
+// .runMode(runMode)
+// .processInstancePriority(PROCESS_INSTANCE_PRIORITY_DEFAULT)
+// .workerGroup(WORKER_GROUP_DEFAULT)
+// .dryRun(DRY_RUN)
+// .scheduleTime(
+// DateUtils.format(startTime, DEFAULT_DATETIME_FORMAT)
+// .concat(COMMA)
+// .concat(DateUtils.format(endTime,
+// DEFAULT_DATETIME_FORMAT)))
+// .execType(execType)
+// .dependentMode(DEPENDENT_MODE_DEFAULT)
+// .expectedParallelismNumber(parallelismNum)
+// .build();
+// iDolphinschedulerService.startProcessDefinition(startProcessDefinitionDto);
+//
+// if (Objects.nonNull(processDefinition)) {
+//
+// final long code = processDefinition.getCode();
+// final String name = processDefinition.getName();
+//
+// InstanceDto instanceDto = null;
+// // waiting dolphinscheduler generate instance.
+// for (int i = 0; i < maxWaitingTimes; i++) {
+// // get instance by process definition name
+// final InstanceListDto instanceListDto =
+// InstanceListDto.builder()
+// .pageNo(PAGE_NO_DEFAULT)
+// .pageSize(PAGE_SIZE_MIN)
+// .name(processDefinition.getName())
+// .build();
+// final PageData<InstanceDto> instancePageData =
+// iInstanceService.list(instanceListDto);
+// if (!CollectionUtils.isEmpty(instancePageData.getData())) {
+// instanceDto = instancePageData.getData().get(0);
+// break;
+// }
+// try {
+// Thread.sleep(waitingSleepTime);
+// } catch (InterruptedException e) {
+// log.error("waiting for getting instance failed", e);
+// throw new SeatunnelException(SeatunnelErrorEnum.GET_INSTANCE_FAILED);
+// }
+// }
+//
+// CompletableFuture.runAsync(
+// () -> {
+// // offline temporary process definition
+// iDolphinschedulerService.updateProcessDefinitionState(
+// code, name, RELEASE_STATE_OFFLINE);
+// })
+// .whenComplete(
+// (_return, e) -> {
+// if (Objects.nonNull(e)) {
+// log.error(
+// "clear temporary process definition failed, process
+// definition code is [{}], name is [{}]",
+// code,
+// name,
+// e);
+// }
+// });
+// return instanceDto;
+//
+// } else {
+// return null;
+// }
+// }
+//
+// @Override
+// public void kill(Long instanceId) {
+// iDolphinschedulerService.killProcessInstance(instanceId);
+// }
+//
+// private ProcessDefinitionDto getProcessDefinitionDto(JobDto dto) {
+// final TaskDescriptionDto taskDescriptionDto =
+// TaskDescriptionDto.builder()
+// .name(dto.getJobName())
+// .executeScript(dto.getExecutorScript())
+// .content(dto.getJobContent())
+// .params(dto.getParams())
+// .retryInterval(dto.getSchedulerConfigDto().getRetryInterval())
+// .retryTimes(dto.getSchedulerConfigDto().getRetryTimes())
+// .build();
+//
+// final UpdateProcessDefinitionDto processDto =
+// UpdateProcessDefinitionDto.builder()
+// .name(dto.getJobName())
+// .startTime(dto.getSchedulerConfigDto().getStartTime())
+// .endTime(dto.getSchedulerConfigDto().getEndTime())
+// .cronExpression(dto.getSchedulerConfigDto().getTriggerExpression())
+// .taskDescriptionDto(taskDescriptionDto)
+// .processDefinitionCode(dto.getJobId())
+// .build();
+//
+// return iDolphinschedulerService.createOrUpdateProcessDefinition(processDto);
+// }
+// }