Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
fd0f5724
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
fd0f5724
编写于
10月 12, 2020
作者:
Z
zhuangchong
提交者:
GitHub
10月 12, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add process define name verify. (#3879)
上级
e8db263d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
3 deletion
+18
-3
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
...olphinscheduler/api/service/ProcessDefinitionService.java
+1
-1
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
...inscheduler/api/service/ProcessDefinitionServiceTest.java
+2
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java
.../dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java
+9
-0
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
...e/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
+6
-0
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
浏览文件 @
fd0f5724
...
...
@@ -413,7 +413,7 @@ public class ProcessDefinitionService extends BaseDAGService {
if
(
resultEnum
!=
Status
.
SUCCESS
)
{
return
checkResult
;
}
ProcessDefinition
processDefinition
=
processDefineMapper
.
quer
yByDefineName
(
project
.
getId
(),
name
);
ProcessDefinition
processDefinition
=
processDefineMapper
.
verif
yByDefineName
(
project
.
getId
(),
name
);
if
(
processDefinition
==
null
)
{
putMsg
(
result
,
Status
.
SUCCESS
);
}
else
{
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
浏览文件 @
fd0f5724
...
...
@@ -373,13 +373,13 @@ public class ProcessDefinitionServiceTest {
//project check auth success, process not exist
putMsg
(
result
,
Status
.
SUCCESS
,
projectName
);
Mockito
.
when
(
processDefineMapper
.
quer
yByDefineName
(
project
.
getId
(),
"test_pdf"
)).
thenReturn
(
null
);
Mockito
.
when
(
processDefineMapper
.
verif
yByDefineName
(
project
.
getId
(),
"test_pdf"
)).
thenReturn
(
null
);
Map
<
String
,
Object
>
processNotExistRes
=
processDefinitionService
.
verifyProcessDefinitionName
(
loginUser
,
"project_test1"
,
"test_pdf"
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
processNotExistRes
.
get
(
Constants
.
STATUS
));
//process exist
Mockito
.
when
(
processDefineMapper
.
quer
yByDefineName
(
project
.
getId
(),
"test_pdf"
)).
thenReturn
(
getProcessDefinition
());
Mockito
.
when
(
processDefineMapper
.
verif
yByDefineName
(
project
.
getId
(),
"test_pdf"
)).
thenReturn
(
getProcessDefinition
());
Map
<
String
,
Object
>
processExistRes
=
processDefinitionService
.
verifyProcessDefinitionName
(
loginUser
,
"project_test1"
,
"test_pdf"
);
Assert
.
assertEquals
(
Status
.
PROCESS_INSTANCE_EXIST
,
processExistRes
.
get
(
Constants
.
STATUS
));
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java
浏览文件 @
fd0f5724
...
...
@@ -31,6 +31,15 @@ import java.util.Map;
*/
public
interface
ProcessDefinitionMapper
extends
BaseMapper
<
ProcessDefinition
>
{
/**
* verify process definition by name
*
* @param projectId projectId
* @param name name
* @return process definition
*/
ProcessDefinition
verifyByDefineName
(
@Param
(
"projectId"
)
int
projectId
,
@Param
(
"processDefinitionName"
)
String
name
);
/**
* query process definition by name
...
...
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
浏览文件 @
fd0f5724
...
...
@@ -18,6 +18,12 @@
<!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.ProcessDefinitionMapper"
>
<select
id=
"verifyByDefineName"
resultType=
"org.apache.dolphinscheduler.dao.entity.ProcessDefinition"
>
select pd.*
from t_ds_process_definition pd
WHERE pd.project_id = #{projectId}
and pd.name = #{processDefinitionName}
</select>
<select
id=
"queryByDefineName"
resultType=
"org.apache.dolphinscheduler.dao.entity.ProcessDefinition"
>
select pd.*,u.user_name,p.name as project_name,t.tenant_code,t.tenant_name,q.queue,q.queue_name
from t_ds_process_definition pd
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录