This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 920ac154cb [Improvement-15744][parameter] project parameter add update
time and update user id (#15745)
920ac154cb is described below
commit 920ac154cb9c0c8f33670af7c67387c0e30f6dd5
Author: 小可耐 <46134044+sdh...@users.noreply.github.com>
AuthorDate: Tue Apr 2 09:42:44 2024 +0800
[Improvement-15744][parameter] project parameter add update time and update
user id (#15745)
* project parameter add update time and update user id
* project parameter add comment operator user id and UT
* project parameter add ui
---
.../api/service/impl/ProjectParameterServiceImpl.java | 2 ++
.../api/service/ProjectParameterServiceTest.java | 3 +++
.../dolphinscheduler/dao/entity/ProjectParameter.java | 8 ++++++++
.../dolphinscheduler/dao/mapper/ProjectParameterMapper.xml | 14 +++++++++-----
.../src/main/resources/sql/dolphinscheduler_h2.sql | 1 +
.../src/main/resources/sql/dolphinscheduler_mysql.sql | 1 +
.../src/main/resources/sql/dolphinscheduler_postgresql.sql | 1 +
.../upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql | 1 +
.../3.2.2_schema/postgresql/dolphinscheduler_ddl.sql | 4 +++-
dolphinscheduler-ui/src/locales/en_US/project.ts | 2 ++
dolphinscheduler-ui/src/locales/zh_CN/project.ts | 2 ++
.../src/views/projects/parameter/use-table.ts | 10 ++++++++++
12 files changed, 43 insertions(+), 6 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
index 6e66f6286e..e30375e809 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
@@ -155,6 +155,8 @@ public class ProjectParameterServiceImpl extends
BaseServiceImpl implements Proj
projectParameter.setParamName(projectParameterName);
projectParameter.setParamValue(projectParameterValue);
+ projectParameter.setUpdateTime(new Date());
+ projectParameter.setOperator(loginUser.getId());
if (projectParameterMapper.updateById(projectParameter) > 0) {
log.info("Project parameter is updated and id is :{}",
projectParameter.getId());
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java
index 4ab22bda21..7a3fb1b68d 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java
@@ -98,6 +98,9 @@ public class ProjectParameterServiceTest {
Mockito.when(projectParameterMapper.updateById(Mockito.any())).thenReturn(1);
result = projectParameterService.updateProjectParameter(loginUser,
projectCode, 1, "key1", "value");
Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode());
+ ProjectParameter projectParameter = (ProjectParameter)
result.getData();
+ Assertions.assertNotNull(projectParameter.getOperator());
+ Assertions.assertNotNull(projectParameter.getUpdateTime());
}
@Test
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectParameter.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectParameter.java
index fbeeb387f1..03e9140145 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectParameter.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectParameter.java
@@ -42,6 +42,8 @@ public class ProjectParameter {
@TableField("user_id")
private Integer userId;
+ private Integer operator;
+
private long code;
@TableField("project_code")
@@ -56,4 +58,10 @@ public class ProjectParameter {
private Date createTime;
private Date updateTime;
+
+ @TableField(exist = false)
+ private String createUser;
+
+ @TableField(exist = false)
+ private String modifyUser;
}
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectParameterMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectParameterMapper.xml
index 159c263ea4..5b22d40a81 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectParameterMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectParameterMapper.xml
@@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
<mapper
namespace="org.apache.dolphinscheduler.dao.mapper.ProjectParameterMapper">
<sql id="baseSql">
- id, param_name, param_value, code, project_code, user_id, create_time,
update_time
+ id, param_name, param_value, code, project_code, user_id, operator,
create_time, update_time
</sql>
<select id="queryByCode"
resultType="org.apache.dolphinscheduler.dao.entity.ProjectParameter">
@@ -51,11 +51,15 @@
<select id="queryProjectParameterListPaging"
resultType="org.apache.dolphinscheduler.dao.entity.ProjectParameter">
select
- <include refid="baseSql"/>
- from t_ds_project_parameter
+ pp.id, param_name, param_value, code, project_code, user_id, operator,
pp.create_time, pp.update_time,
+ u.user_name as create_user,
+ u2.user_name as modify_user
+ from t_ds_project_parameter pp
+ left join t_ds_user u on pp.user_id = u.id
+ left join t_ds_user u2 on pp.operator = u2.id
where project_code = #{projectCode}
<if test="projectParameterIds != null and projectParameterIds.size() >
0">
- and id in
+ and pp.id in
<foreach item="id" index="index" collection="projectParameterIds"
open="(" separator="," close=")">
#{id}
</foreach>
@@ -65,7 +69,7 @@
OR param_value LIKE concat('%', #{searchName}, '%')
)
</if>
- order by update_time desc
+ order by pp.update_time desc
</select>
<select id="queryByProjectCode"
resultType="org.apache.dolphinscheduler.dao.entity.ProjectParameter">
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
index f74000e731..3c7b8805a0 100644
--- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
+++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
@@ -670,6 +670,7 @@ CREATE TABLE t_ds_project_parameter
code bigint(20) NOT NULL,
project_code bigint(20) NOT NULL,
user_id int(11) DEFAULT NULL,
+ operator int(11) DEFAULT NULL,
create_time datetime NOT NULL,
update_time datetime DEFAULT NULL,
PRIMARY KEY (id),
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
index 39512d8c70..57401291ed 100644
--- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
+++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
@@ -673,6 +673,7 @@ CREATE TABLE `t_ds_project_parameter` (
`code` bigint(20) NOT NULL COMMENT 'encoding',
`project_code` bigint(20) NOT NULL COMMENT 'project code',
`user_id` int(11) DEFAULT NULL COMMENT 'creator id',
+ `operator` int(11) DEFAULT NULL COMMENT 'operator user id',
`create_time` datetime NOT NULL COMMENT 'create time',
`update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`),
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
index 946a544064..8313542ab8 100644
---
a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
+++
b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
@@ -598,6 +598,7 @@ CREATE TABLE t_ds_project_parameter (
code bigint NOT NULL,
project_code bigint NOT NULL,
user_id int DEFAULT NULL ,
+ operator int DEFAULT NULL ,
create_time timestamp DEFAULT CURRENT_TIMESTAMP ,
update_time timestamp DEFAULT CURRENT_TIMESTAMP ,
PRIMARY KEY (id)
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql
index 7a3ab5df68..5ee7453d46 100644
---
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql
@@ -25,3 +25,4 @@ CREATE TABLE `t_ds_relation_project_worker_group` (
UNIQUE KEY unique_project_worker_group(project_code,worker_group)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin;
+ALTER TABLE t_ds_project_parameter ADD `operator` int(11) DEFAULT NULL
COMMENT 'operator user id';
\ No newline at end of file
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/postgresql/dolphinscheduler_ddl.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/postgresql/dolphinscheduler_ddl.sql
index 587bab4159..90646557c0 100644
---
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/postgresql/dolphinscheduler_ddl.sql
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.2_schema/postgresql/dolphinscheduler_ddl.sql
@@ -27,4 +27,6 @@ CREATE TABLE t_ds_relation_project_worker_group (
DROP SEQUENCE IF EXISTS t_ds_relation_project_worker_group_sequence;
CREATE SEQUENCE t_ds_relation_project_worker_group_sequence;
-ALTER TABLE t_ds_relation_project_worker_group ALTER COLUMN id SET DEFAULT
NEXTVAL('t_ds_relation_project_worker_group_sequence');
\ No newline at end of file
+ALTER TABLE t_ds_relation_project_worker_group ALTER COLUMN id SET DEFAULT
NEXTVAL('t_ds_relation_project_worker_group_sequence');
+
+ALTER TABLE t_ds_project_parameter ADD COLUMN IF NOT EXISTS operator int;
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts
b/dolphinscheduler-ui/src/locales/en_US/project.ts
index 152b2058d9..cb50b19fc7 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -927,6 +927,8 @@ export default {
code: 'Parameter Code',
name: 'Parameter Name',
value: 'Parameter Value',
+ create_user: 'Create User',
+ modify_user: 'Modify User',
create_time: 'Create Time',
update_time: 'Update Time',
name_tips: 'Please enter your parameter name',
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
index 42c637a6e4..6865a49abc 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -897,6 +897,8 @@ export default {
code: '参数编码',
name: '参数名称',
value: '参数值',
+ create_user: '创建用户',
+ modify_user: '修改用户',
create_time: '创建时间',
update_time: '更新时间',
name_tips: '请输入参数名称',
diff --git a/dolphinscheduler-ui/src/views/projects/parameter/use-table.ts
b/dolphinscheduler-ui/src/views/projects/parameter/use-table.ts
index e0d4b940cf..9d0bf35dcd 100644
--- a/dolphinscheduler-ui/src/views/projects/parameter/use-table.ts
+++ b/dolphinscheduler-ui/src/views/projects/parameter/use-table.ts
@@ -69,6 +69,16 @@ export function useTable() {
key: 'paramValue',
...COLUMN_WIDTH_CONFIG['name']
},
+ {
+ title: t('project.parameter.create_user'),
+ key: 'createUser',
+ ...COLUMN_WIDTH_CONFIG['name']
+ },
+ {
+ title: t('project.parameter.modify_user'),
+ key: 'modifyUser',
+ ...COLUMN_WIDTH_CONFIG['name']
+ },
{
title: t('project.parameter.create_time'),
key: 'createTime',
