Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
570f8f52
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
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,发现更多精彩内容 >>
提交
570f8f52
编写于
3月 28, 2020
作者:
B
break60
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler
into dev
上级
2aa4ac88
a851168a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
9 deletion
+10
-9
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
.../dolphinscheduler/api/service/ProcessInstanceService.java
+1
-7
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
...e/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
+3
-1
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
...che/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+6
-1
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
浏览文件 @
570f8f52
...
...
@@ -204,14 +204,8 @@ public class ProcessInstanceService extends BaseDAGService {
}
}
Set
<
String
>
exclusionSet
=
new
HashSet
<>();
exclusionSet
.
add
(
Constants
.
CLASS
);
exclusionSet
.
add
(
"locations"
);
exclusionSet
.
add
(
"connects"
);
exclusionSet
.
add
(
"processInstanceJson"
);
pageInfo
.
setTotalCount
((
int
)
processInstanceList
.
getTotal
());
pageInfo
.
setLists
(
CollectionUtils
.
getListByExclusion
(
processInstances
,
exclusionSet
)
);
pageInfo
.
setLists
(
processInstances
);
result
.
put
(
Constants
.
DATA_LIST
,
pageInfo
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
...
...
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
浏览文件 @
570f8f52
...
...
@@ -29,7 +29,9 @@
and pd.name = #{processDefinitionName}
</select>
<select
id=
"queryDefineListPaging"
resultType=
"org.apache.dolphinscheduler.dao.entity.ProcessDefinition"
>
SELECT td.*,sc.schedule_release_state,tu.user_name
SELECT td.id, td.name, td.version, td.release_state, td.project_id, td.user_id, td.description, td.global_params,
td.flag, td.receivers, td.receivers_cc, td.timeout, td.tenant_id, td.modify_by, td.update_time, td.create_time,
sc.schedule_release_state, tu.user_name
FROM t_ds_process_definition td
left join (select process_definition_id,release_state as schedule_release_state from t_ds_schedules group by process_definition_id,release_state) sc on sc.process_definition_id = td.id
left join t_ds_user tu on td.user_id = tu.id
...
...
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
浏览文件 @
570f8f52
...
...
@@ -66,7 +66,12 @@
</select>
<select
id=
"queryProcessInstanceListPaging"
resultType=
"org.apache.dolphinscheduler.dao.entity.ProcessInstance"
>
select instance.*
select instance.id, instance.name, instance.process_definition_id, instance.state, instance.recovery, instance.start_time,
instance.end_time, instance.run_times, instance.host, instance.command_type, instance.command_param, instance.task_depend_type,
instance.max_try_times, instance.failure_strategy, instance.warning_type, instance.warning_group_id, instance.schedule_time,
instance.command_start_time, instance.global_params, instance.flag, instance.is_sub_process, instance.executor_id,
instance.history_cmd, instance.dependence_schedule_times, instance.process_instance_priority, instance.worker_group_id,
instance.timeout, instance.tenant_id, instance.update_time
from t_ds_process_instance instance
join t_ds_process_definition define ON instance.process_definition_id = define.id
where 1=1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录