Skip to content

Commit 3ed556d

Browse files
author
xlinliu
committed
upload flow compare info to schedulis
1 parent 5ff0122 commit 3ed556d

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

dss-appconn/appconns/dss-eventchecker-appconn/src/main/scala/com/webank/wedatasphere/dss/appconn/eventchecker/execution/EventCheckerRefExecutionOperation.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class EventCheckerRefExecutionOperation
7070
}
7171

7272
override def submit(requestRef: RefExecutionRequestRef.RefExecutionContextRequestRef): RefExecutionAction = {
73+
requestRef.getExecutionRequestRefContext
7374
val nodeAction = new EventCheckerExecutionAction()
7475
nodeAction.setId(UUID.randomUUID().toString)
7576
import scala.collection.JavaConversions.mapAsScalaMap

dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/utils/SchedulisHttpUtils.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,15 @@ public static String getHttpPostResult(String url,
8080
return getHttpResult(url, getAction, ssoRequestOperation, workspace);
8181
}
8282

83+
public static String getHttpPostResult(String url,
84+
Map<String, String> params,
85+
Map<String, Object> payloads,
86+
SSORequestOperation<HttpAction, HttpResult> ssoRequestOperation,
87+
Workspace workspace) {
88+
DSSPostAction getAction = new DSSPostAction();
89+
getAction.getFormParams().putAll(params);
90+
getAction.getRequestPayloads().putAll(payloads);
91+
return getHttpResult(url, getAction, ssoRequestOperation, workspace);
92+
}
93+
8394
}

dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestOrchestratorVersion.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ public class RequestOrchestratorVersion {
2222
private String username;
2323
private Long projectId;
2424
private Long orchestratorId;
25-
private String dssLabel;
2625

2726

28-
public static RequestOrchestratorVersion newInstance(String username, Long projectId, Long orchestratorId, String dssLabel) {
27+
28+
public static RequestOrchestratorVersion newInstance(String username, Long projectId, Long orchestratorId) {
2929
RequestOrchestratorVersion requestOrchestratorVersion = new RequestOrchestratorVersion();
3030
requestOrchestratorVersion.setOrchestratorId(orchestratorId);
31-
requestOrchestratorVersion.setDssLabel(dssLabel);
3231
requestOrchestratorVersion.setProjectId(projectId);
3332
requestOrchestratorVersion.setUsername(username);
3433
return requestOrchestratorVersion;
@@ -59,11 +58,7 @@ public void setOrchestratorId(Long orchestratorId) {
5958
this.orchestratorId = orchestratorId;
6059
}
6160

62-
public String getDssLabel() {
63-
return dssLabel;
64-
}
6561

66-
public void setDssLabel(String dssLabel) {
67-
this.dssLabel = dssLabel;
68-
}
62+
63+
6964
}

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/src/main/java/com/webank/wedatasphere/dss/workflow/core/entity/Workflow.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public interface Workflow extends Flow {
3434

3535
List<Map<String, Object>> getFlowProperties();
3636

37+
38+
List<Workflow> getChildren();
39+
3740
Long getCreateTime();
3841

3942
Long getUpdateTime();

0 commit comments

Comments
 (0)