Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liyuanzhong001
DolphinScheduler
提交
ddb34cb6
DolphinScheduler
项目概览
liyuanzhong001
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
11
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
ddb34cb6
编写于
6月 28, 2019
作者:
leon-baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add tenant id in process definition
上级
1b2153a3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
0 deletion
+20
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
.../java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
+11
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
.../escheduler/dao/mapper/ProcessInstanceMapperProvider.java
+2
-0
escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessInstance.java
...rc/main/java/cn/escheduler/dao/model/ProcessInstance.java
+7
-0
未找到文件。
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
浏览文件 @
ddb34cb6
...
...
@@ -97,6 +97,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"queue"
,
column
=
"queue"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryDetailById"
)
...
...
@@ -136,6 +137,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryById"
)
...
...
@@ -175,6 +177,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -214,6 +217,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -262,6 +266,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -359,6 +364,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -452,6 +458,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -497,6 +504,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -542,6 +550,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -585,6 +594,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryLastRunningProcess"
)
...
...
@@ -628,6 +638,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"processInstanceJson"
,
column
=
"process_instance_json"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryLastManualProcess"
)
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
浏览文件 @
ddb34cb6
...
...
@@ -69,6 +69,7 @@ public class ProcessInstanceMapperProvider {
VALUES
(
"`executor_id`"
,
"#{processInstance.executorId}"
);
VALUES
(
"`worker_group_id`"
,
"#{processInstance.workerGroupId}"
);
VALUES
(
"`timeout`"
,
"#{processInstance.timeout}"
);
VALUES
(
"`tenant_id`"
,
"#{processInstance.tenantId}"
);
VALUES
(
"`process_instance_priority`"
,
EnumFieldUtil
.
genFieldStr
(
"processInstance.processInstancePriority"
,
Priority
.
class
));
}
}.
toString
();
...
...
@@ -141,6 +142,7 @@ public class ProcessInstanceMapperProvider {
SET
(
"`dependence_schedule_times`=#{processInstance.dependenceScheduleTimes}"
);
SET
(
"`is_sub_process`="
+
EnumFieldUtil
.
genFieldStr
(
"processInstance.isSubProcess"
,
Flag
.
class
));
SET
(
"`executor_id`=#{processInstance.executorId}"
);
SET
(
"`tenant_id`=#{processInstance.tenantId}"
);
SET
(
"`worker_group_id`=#{processInstance.workerGroupId}"
);
SET
(
"`timeout`=#{processInstance.timeout}"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessInstance.java
浏览文件 @
ddb34cb6
...
...
@@ -188,6 +188,12 @@ public class ProcessInstance {
*/
private
int
timeout
;
/**
* tenant id
*/
private
String
tenantId
;
public
ProcessInstance
(){
}
...
...
@@ -534,6 +540,7 @@ public class ProcessInstance {
", processInstanceJson='"
+
processInstanceJson
+
'\''
+
", executorId="
+
executorId
+
", tenantCode='"
+
tenantCode
+
'\''
+
", tenantId='"
+
tenantId
+
'\''
+
", queue='"
+
queue
+
'\''
+
", isSubProcess="
+
isSubProcess
+
", locations='"
+
locations
+
'\''
+
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录