Browse Source

add query

许家凯 4 years ago
parent
commit
e38753901e

+ 6 - 7
src/main/java/com/winhc/dataworks/flow/touch/Main.java

@@ -6,14 +6,13 @@ import com.helospark.lightdi.LightDi;
 import com.helospark.lightdi.LightDiContext;
 import com.helospark.lightdi.annotation.Autowired;
 import com.helospark.lightdi.annotation.Service;
-import com.winhc.dataworks.flow.touch.bean.TaskParam;
 import com.winhc.dataworks.flow.touch.service.TouchService;
 import com.winhc.dataworks.flow.touch.utils.JsonUtils;
 import com.winhc.dataworks.flow.touch.utils.YmlUtil;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Author: XuJiakai
@@ -56,14 +55,14 @@ public class Main {
 
 
         TaskParam build = TaskParam.builder().projectName("winhc_test")
-                .flowName("test_touch")
-                .bizDate("2020-06-04")
+                .flowName("增量处理流程_spark")
+                .bizDate("2020-06-20")
                 .nodeParam(map).build();
         CreateManualDagResponse touch = touchService.touch(build);
         System.out.println(JsonUtils.jsonObjToString(touch));*/
     }
 
-    private void query(){
-        touchService.query("winhc_test",700134013109L);
+    private void query() {
+        touchService.query("winhc_test", 700134329791L);
     }
 }

+ 0 - 27
src/main/java/com/winhc/dataworks/flow/touch/bean/NodeParam.java

@@ -1,27 +0,0 @@
-package com.winhc.dataworks.flow.touch.bean;
-
-import com.winhc.dataworks.flow.touch.utils.JsonUtils;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * @Author: XuJiakai
- * @Date: 2020/6/22 14:42
- * @Description:
- */
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class NodeParam {
-
-    private String nodeId;
-    private String params;
-
-    @Override
-    public String toString() {
-        return JsonUtils.jsonObjToString(this);
-    }
-}

+ 45 - 0
src/main/java/com/winhc/dataworks/flow/touch/bean/TaskFlowEnum.java

@@ -0,0 +1,45 @@
+package com.winhc.dataworks.flow.touch.bean;
+
+import lombok.Getter;
+
+/**
+ * @Author: XuJiakai
+ * @Date: 2020/6/23 10:58
+ * @Description:
+ */
+@Getter
+@SuppressWarnings("all")
+public enum TaskFlowEnum {
+    NOT_RUN(1, "未运行"),
+    WAIT_TIME(2, "等待时间"),
+    WAIT_RESOURCE(3, "等待资源"),
+    RUNNING(4, "运行中"),
+    FAILURE(5, "运行失败"),
+    SUCCESS(6, "运行成功"),
+    CHECKING(7, "校检中"),
+
+    ;
+    private final int code;
+    private final String msg;
+
+    TaskFlowEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public static TaskFlowEnum getTaskFlowEnumByCode(Integer code) {
+        if (code != null) {
+            for (TaskFlowEnum value : TaskFlowEnum.values()) {
+                if (code == value.getCode()) {
+                    return value;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return msg;
+    }
+}

+ 2 - 4
src/main/java/com/winhc/dataworks/flow/touch/service/TouchService.java

@@ -6,9 +6,9 @@ import com.aliyuncs.dataworks_public.model.v20180601.CreateManualDagResponse;
 import com.aliyuncs.dataworks_public.model.v20180601.SearchManualDagNodeInstanceRequest;
 import com.aliyuncs.dataworks_public.model.v20180601.SearchManualDagNodeInstanceResponse;
 import com.aliyuncs.http.ProtocolType;
-import com.google.gson.JsonObject;
 import com.helospark.lightdi.annotation.Autowired;
 import com.helospark.lightdi.annotation.Service;
+import com.winhc.dataworks.flow.touch.bean.TaskFlowEnum;
 import com.winhc.dataworks.flow.touch.bean.TaskParam;
 import com.winhc.dataworks.flow.touch.configuration.DataWorksAccessProperties;
 import com.winhc.dataworks.flow.touch.utils.JsonUtils;
@@ -101,10 +101,8 @@ public class TouchService {
         SearchManualDagNodeInstanceResponse searchResponse = client
                 .getAcsResponse(searchNodeInstanceListRequest);     //查询实例。
         java.util.List<SearchManualDagNodeInstanceResponse.NodeInsInfo> nodeInsfos = searchResponse.getData();
-        System.out.println(searchResponse.getErrMsg()); //错误码。0代码正常;非0数值代表报错。
         for (SearchManualDagNodeInstanceResponse.NodeInsInfo nodeInsInfo : nodeInsfos) {
-            System.out.println(nodeInsInfo.getNodeName()); //输出节点名称。
-            System.out.println(nodeInsInfo.getStatus());  //输出状态信息。
+            log.info("{}:{} {}", nodeInsInfo.getNodeName(), nodeInsInfo.getStatus(), TaskFlowEnum.getTaskFlowEnumByCode(nodeInsInfo.getStatus()));
         }
     }