|
@@ -15,6 +15,9 @@ import com.winhc.dataworks.flow.touch.utils.JsonUtils;
|
|
|
import lombok.SneakyThrows;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
+import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
+
|
|
|
/**
|
|
|
* @Author: XuJiakai
|
|
|
* @Date: 2020/6/22 11:28
|
|
@@ -50,7 +53,7 @@ public class TouchService {
|
|
|
|
|
|
@SneakyThrows
|
|
|
public CreateManualDagResponse triggerWithParam(String projectName
|
|
|
- , String flowName, String bizDate,String dagPara,String nodePara) {
|
|
|
+ , String flowName, String bizDate, String dagPara, String nodePara) {
|
|
|
log.info("触发任务:{}.{} {}", projectName, flowName, bizDate);
|
|
|
CreateManualDagRequest request = new CreateManualDagRequest();
|
|
|
request.setProjectName(projectName);
|
|
@@ -92,18 +95,20 @@ public class TouchService {
|
|
|
|
|
|
|
|
|
@SneakyThrows
|
|
|
- public void query(String projectName, Long dagId) {
|
|
|
+ public Map<String, TaskFlowEnum> query(String projectName, Long dagId) {
|
|
|
SearchManualDagNodeInstanceRequest searchNodeInstanceListRequest
|
|
|
= new SearchManualDagNodeInstanceRequest();
|
|
|
searchNodeInstanceListRequest.setDagId(dagId);
|
|
|
- searchNodeInstanceListRequest.setProjectName(projectName); //项目名。
|
|
|
+ searchNodeInstanceListRequest.setProjectName(projectName);
|
|
|
searchNodeInstanceListRequest.setProtocol(ProtocolType.HTTP);
|
|
|
SearchManualDagNodeInstanceResponse searchResponse = client
|
|
|
- .getAcsResponse(searchNodeInstanceListRequest); //查询实例。
|
|
|
+ .getAcsResponse(searchNodeInstanceListRequest);
|
|
|
java.util.List<SearchManualDagNodeInstanceResponse.NodeInsInfo> nodeInsfos = searchResponse.getData();
|
|
|
for (SearchManualDagNodeInstanceResponse.NodeInsInfo nodeInsInfo : nodeInsfos) {
|
|
|
log.info("{}:{} {}", nodeInsInfo.getNodeName(), nodeInsInfo.getStatus(), TaskFlowEnum.getTaskFlowEnumByCode(nodeInsInfo.getStatus()));
|
|
|
}
|
|
|
+ return nodeInsfos.stream()
|
|
|
+ .collect(Collectors.toMap(SearchManualDagNodeInstanceResponse.NodeInsInfo::getNodeName, node -> TaskFlowEnum.getTaskFlowEnumByCode(node.getStatus()), (o1, o2) -> o1));
|
|
|
}
|
|
|
|
|
|
}
|