You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ar...@apache.org on 2025/01/16 17:03:38 UTC
(seatunnel-web) branch main updated: [Improve] Display user nickname in task instance listing (#266)
This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/seatunnel-web.git
The following commit(s) were added to refs/heads/main by this push:
new 40d894f6 [Improve] Display user nickname in task instance listing (#266)
40d894f6 is described below
commit 40d894f692b3229b853f51cb3579adb87637d645
Author: Jast <sh...@apache.org>
AuthorDate: Fri Jan 17 01:03:33 2025 +0800
[Improve] Display user nickname in task instance listing (#266)
---
.../seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java | 6 ++----
.../app/domain/dto/job/SeaTunnelJobInstanceDto.java | 2 ++
.../app/service/impl/TaskInstanceServiceImpl.java | 15 ++-------------
.../seatunnel/app/dal/mapper/JobInstanceMapper.xml | 18 ++++++++++--------
.../task/synchronization-instance/use-sync-task.ts | 2 +-
5 files changed, 17 insertions(+), 26 deletions(-)
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 8cd2d10b..5ece7250 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
@@ -73,10 +73,8 @@ public class JobInstanceDaoImpl implements IJobInstanceDao {
Date endTime,
String jobDefineName,
JobMode jobMode) {
- IPage<SeaTunnelJobInstanceDto> jobInstanceIPage =
- jobInstanceMapper.queryJobInstanceListPaging(
- page, startTime, endTime, jobDefineName, jobMode);
- return jobInstanceIPage;
+ return jobInstanceMapper.queryJobInstanceListPaging(
+ page, startTime, endTime, jobDefineName, jobMode);
}
@Override
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
index ba69e600..f01140ec 100644
--- 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
@@ -30,4 +30,6 @@ public class SeaTunnelJobInstanceDto extends JobInstance {
private long writeRowCount;
private Long runningTime;
+
+ private String username;
}
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
index dd249e71..d40b69ad 100644
--- 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
@@ -21,7 +21,6 @@ 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.dal.entity.JobInstance;
import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
import org.apache.seatunnel.app.domain.response.executor.JobExecutionStatus;
@@ -93,7 +92,8 @@ public class TaskInstanceServiceImpl implements ITaskInstanceService<SeaTunnelJo
if (CollectionUtils.isEmpty(records)) {
return result;
}
- populateExecutionMetricsData(userId, jobMode, records);
+ addRunningTimeToResult(records);
+ jobPipelineSummaryMetrics(records, jobMode, userId);
pageInfo.setTotal((int) jobInstanceIPage.getTotal());
pageInfo.setTotalList(records);
result.setData(pageInfo);
@@ -102,7 +102,6 @@ public class TaskInstanceServiceImpl implements ITaskInstanceService<SeaTunnelJo
private void populateExecutionMetricsData(
Integer userId, JobMode jobMode, List<SeaTunnelJobInstanceDto> records) {
- addJobDefineNameToResult(records);
addRunningTimeToResult(records);
jobPipelineSummaryMetrics(records, jobMode, userId);
}
@@ -126,16 +125,6 @@ public class TaskInstanceServiceImpl implements ITaskInstanceService<SeaTunnelJo
}
}
- private void addJobDefineNameToResult(List<SeaTunnelJobInstanceDto> records) {
- for (SeaTunnelJobInstanceDto jobInstanceDto : records) {
- JobDefinition jobDefinition =
- jobDefinitionService.getJobDefinitionByJobId(jobInstanceDto.getJobDefineId());
- if (jobDefinition != null) {
- jobInstanceDto.setJobDefineName(jobDefinition.getName());
- }
- }
- }
-
public Date dateConverter(String time) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
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 3862c798..6f4b4dfa 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
@@ -32,26 +32,28 @@
</sql>
<select id="queryJobInstanceListPaging" resultType="org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto">
- SELECT *
- FROM t_st_job_instance
+ SELECT ji.*, jd.name AS jobDefineName, cu.username AS username
+ FROM t_st_job_instance ji
+ LEFT JOIN t_st_job_definition jd ON ji.job_define_id = jd.id
+ LEFT JOIN user cu ON ji.create_user_id = cu.id
<where>
<if test="startTime != null">
- AND create_time <![CDATA[ >=]]> #{startTime}
+ AND ji.create_time <![CDATA[ >=]]> #{startTime}
</if>
<if test="endTime == null">
- AND (end_time is null or end_time <![CDATA[ <=]]> #{endTime})
+ AND (ji.end_time is null or ji.end_time <![CDATA[ <=]]> #{endTime})
</if>
<if test="endTime != null">
- AND (end_time <![CDATA[ <=]]> #{endTime} or end_time is null)
+ AND (ji.end_time <![CDATA[ <=]]> #{endTime} or ji.end_time is null)
</if>
<if test="jobDefineName != null">
- AND job_define_id in (select x.id from t_st_job_definition x where x.name LIKE concat('%', #{jobDefineName}, '%'))
+ AND jd.name LIKE concat('%', #{jobDefineName}, '%')
</if>
<if test="jobMode != null">
- AND job_type = #{jobMode}
+ AND ji.job_type = #{jobMode}
</if>
</where>
- ORDER BY create_time DESC
+ ORDER BY ji.create_time DESC
</select>
<select id="getJobExecutionStatus" resultType="org.apache.seatunnel.app.dal.entity.JobInstance">
SELECT `job_status`, `error_message`
diff --git a/seatunnel-ui/src/views/task/synchronization-instance/use-sync-task.ts b/seatunnel-ui/src/views/task/synchronization-instance/use-sync-task.ts
index 1f32b9a3..9435d1ab 100644
--- a/seatunnel-ui/src/views/task/synchronization-instance/use-sync-task.ts
+++ b/seatunnel-ui/src/views/task/synchronization-instance/use-sync-task.ts
@@ -138,7 +138,7 @@ export function useSyncTask(syncTaskType = 'BATCH') {
},
{
title: t('project.synchronization_instance.execute_user'),
- key: 'createUserId',
+ key: 'username',
...COLUMN_WIDTH_CONFIG['state']
},
{