Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
2e745568
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
707
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,发现更多精彩内容 >>
提交
2e745568
编写于
4月 22, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add worker group id in command/process instance/error command
上级
79e11a87
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
4 deletion
+18
-4
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapper.java
...src/main/java/cn/escheduler/dao/mapper/CommandMapper.java
+2
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapperProvider.java
.../java/cn/escheduler/dao/mapper/CommandMapperProvider.java
+2
-4
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapperProvider.java
.../cn/escheduler/dao/mapper/ErrorCommandMapperProvider.java
+1
-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/mapper/CommandMapper.java
浏览文件 @
2e745568
...
...
@@ -79,6 +79,7 @@ public interface CommandMapper {
@Result
(
property
=
"scheduleTime"
,
column
=
"schedule_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"updateTime"
,
column
=
"update_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"startTime"
,
column
=
"start_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_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
=
CommandMapperProvider
.
class
,
method
=
"queryOneCommand"
)
...
...
@@ -101,6 +102,7 @@ public interface CommandMapper {
@Result
(
property
=
"scheduleTime"
,
column
=
"schedule_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"updateTime"
,
column
=
"update_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"startTime"
,
column
=
"start_time"
,
javaType
=
Timestamp
.
class
,
jdbcType
=
JdbcType
.
DATE
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_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
=
CommandMapperProvider
.
class
,
method
=
"queryAllCommand"
)
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapperProvider.java
浏览文件 @
2e745568
...
...
@@ -51,6 +51,7 @@ public class CommandMapperProvider {
VALUES
(
"`warning_group_id`"
,
"#{command.warningGroupId}"
);
VALUES
(
"`schedule_time`"
,
"#{command.scheduleTime}"
);
VALUES
(
"`update_time`"
,
"#{command.updateTime}"
);
VALUES
(
"`worker_group_id`"
,
"#{command.workerGroupId}"
);
VALUES
(
"`start_time`"
,
"#{command.startTime}"
);
}
...
...
@@ -95,6 +96,7 @@ public class CommandMapperProvider {
SET
(
"`warning_group_id`=#{command.warningGroupId}"
);
SET
(
"`schedule_time`=#{command.scheduleTime}"
);
SET
(
"`update_time`=#{command.updateTime}"
);
SET
(
"`worker_group_id`=#{command.workerGroupId}"
);
SET
(
"`start_time`=#{command.startTime}"
);
WHERE
(
"`id`=#{command.id}"
);
...
...
@@ -166,8 +168,4 @@ public class CommandMapperProvider {
}
}.
toString
();
}
}
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapperProvider.java
浏览文件 @
2e745568
...
...
@@ -34,6 +34,7 @@ public class ErrorCommandMapperProvider {
VALUES
(
"`schedule_time`"
,
"#{errorCommand.scheduleTime}"
);
VALUES
(
"`update_time`"
,
"#{errorCommand.updateTime}"
);
VALUES
(
"`start_time`"
,
"#{errorCommand.startTime}"
);
VALUES
(
"`worker_group_id`"
,
"#{errorCommand.workerGroupId}"
);
VALUES
(
"`message`"
,
"#{errorCommand.message}"
);
}
}.
toString
();
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
浏览文件 @
2e745568
...
...
@@ -94,6 +94,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"tenantCode"
,
column
=
"tenant_code"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_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"
)
...
...
@@ -131,6 +132,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"connects"
,
column
=
"connects"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryById"
)
...
...
@@ -168,6 +170,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -205,6 +208,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -251,6 +255,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -346,6 +351,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -437,6 +443,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -480,6 +487,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -523,6 +531,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
...
...
@@ -564,6 +573,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
@SelectProvider
(
type
=
ProcessInstanceMapperProvider
.
class
,
method
=
"queryLastRunningProcess"
)
...
...
@@ -605,6 +615,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"historyCmd"
,
column
=
"history_cmd"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@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
=
"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
浏览文件 @
2e745568
...
...
@@ -67,6 +67,7 @@ public class ProcessInstanceMapperProvider {
VALUES
(
"`dependence_schedule_times`"
,
"#{processInstance.dependenceScheduleTimes}"
);
VALUES
(
"`is_sub_process`"
,
EnumFieldUtil
.
genFieldStr
(
"processInstance.isSubProcess"
,
Flag
.
class
));
VALUES
(
"`executor_id`"
,
"#{processInstance.executorId}"
);
VALUES
(
"`worker_group_id`"
,
"#{processInstance.workerGroupId}"
);
VALUES
(
"`process_instance_priority`"
,
EnumFieldUtil
.
genFieldStr
(
"processInstance.processInstancePriority"
,
Priority
.
class
));
}
}.
toString
();
...
...
@@ -139,6 +140,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
(
"`worker_group_id`=#{processInstance.workerGroupId}"
);
WHERE
(
"`id`=#{processInstance.id}"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录