From 7fd599e738a64e259ff6f2ccfe93781969af5d4b Mon Sep 17 00:00:00 2001 From: wuchao Date: Wed, 20 Mar 2024 16:25:48 +0800 Subject: [PATCH 1/5] project parameter add update time and update user id --- .../api/service/impl/ProjectParameterServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 6e66f6286e9c..c10529ac8508 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 Result updateProjectParameter(User loginUser, long projectCode, long code projectParameter.setParamName(projectParameterName); projectParameter.setParamValue(projectParameterValue); + projectParameter.setUpdateTime(new Date()); + projectParameter.setUserId(loginUser.getId()); if (projectParameterMapper.updateById(projectParameter) > 0) { log.info("Project parameter is updated and id is :{}", projectParameter.getId()); From 20a30f00fd3cc665b145cb0282608d3f1071130b Mon Sep 17 00:00:00 2001 From: wuchao Date: Thu, 21 Mar 2024 09:58:05 +0800 Subject: [PATCH 2/5] project parameter add comment operator user id and UT --- .../api/service/impl/ProjectParameterServiceImpl.java | 2 +- .../api/service/ProjectParameterServiceTest.java | 3 +++ .../apache/dolphinscheduler/dao/entity/ProjectParameter.java | 2 ++ .../dolphinscheduler/dao/mapper/ProjectParameterMapper.xml | 2 +- .../src/main/resources/sql/dolphinscheduler_h2.sql | 1 + .../src/main/resources/sql/dolphinscheduler_mysql.sql | 1 + .../src/main/resources/sql/dolphinscheduler_postgresql.sql | 1 + .../sql/upgrade/3.2.2_schema/mysql/dolphinscheduler_ddl.sql | 1 + .../upgrade/3.2.2_schema/postgresql/dolphinscheduler_ddl.sql | 4 +++- 9 files changed, 14 insertions(+), 3 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 c10529ac8508..e30375e80945 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 @@ -156,7 +156,7 @@ public Result updateProjectParameter(User loginUser, long projectCode, long code projectParameter.setParamName(projectParameterName); projectParameter.setParamValue(projectParameterValue); projectParameter.setUpdateTime(new Date()); - projectParameter.setUserId(loginUser.getId()); + 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 4ab22bda21d6..7a3fb1b68d32 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 void testUpdateProjectParameter() { 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 fbeeb387f1ba..9eab320c7132 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") 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 159c263ea44d..e9bfaedb45fb 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 @@ - 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 select - - 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} and id in diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 152b2058d917..cb50b19fc737 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 42c637a6e469..6865a49abc2f 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 e0d4b940cf13..9d0bf35dcde0 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', From 0d60c55be2ab908576abd847960cab662fb44790 Mon Sep 17 00:00:00 2001 From: wuchao Date: Sat, 23 Mar 2024 13:47:35 +0800 Subject: [PATCH 4/5] fix specify the parameter id --- .../dolphinscheduler/dao/mapper/ProjectParameterMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f5db6ce627a..9a4f852941ca 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 @@ -59,7 +59,7 @@ left join t_ds_user u2 on pp.operator = u2.id where project_code = #{projectCode} - and id in + and pp.id in #{id} From 33623e5231d8bb2a3c036e33d62a0dc31af2ea67 Mon Sep 17 00:00:00 2001 From: wuchao Date: Sat, 23 Mar 2024 13:56:17 +0800 Subject: [PATCH 5/5] fix specify the parameter update_time --- .../dolphinscheduler/dao/mapper/ProjectParameterMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a4f852941ca..5b22d40a81a7 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 @@ -69,7 +69,7 @@ OR param_value LIKE concat('%', #{searchName}, '%') ) - order by update_time desc + order by pp.update_time desc