Merge branch 'master' of http://139.224.213.4:3000/bigdata/DataWorks-flow-touch

jobs/task-step01.5.yaml

@@ -0,0 +1,14 @@
+job:
+  #------<企业cid、自然人身份证补全:Spark
+  - project: winhc_test
+    flow: company_person_info_completion
+    task:
+      - taskName: company_cloze
+        param:
+          - _nodeId: 700003580841
+            project: winhc_eci_dev
+            flag: false
+          - _nodeId: 700003578968
+            project: winhc_eci_dev
+            flag: false
+  #------>

jobs/task-step01.yaml

@@ -87,16 +87,12 @@ job:
             source: winhc_eci.inc_ods_company_account_with_bank_pre
             target: winhc_eci_dev.inc_ods_company_account_with_bank
             flag: 1
-  #------<企业cid、自然人身份证补全:Spark
-  - project: winhc_test
-    flow: company_person_info_completion
-    task:
-      - taskName: company_cloze
+
+      #限制高消费
+      - taskName: inc_ods_company_zxr_restrict_pre
         param:
-          - _nodeId: 700003580841
-            project: winhc_eci_dev
-            flag: false
-          - _nodeId: 700003578968
+          - _nodeId: 700003517752
             project: winhc_eci_dev
-            flag: false
-  #------>
+            source: winhc_eci.inc_ods_company_zxr_restrict_pre
+            target: winhc_eci_dev.inc_ods_company_zxr_restrict
+            flag: 0

jobs/task-step06.yaml

@@ -0,0 +1,11 @@
+job:
+  - project: winhc_eci
+    flow: 司法案件
+    task:
+      #司法案件
+      - taskName: step_01_judicial_case_relation
+        param:
+          - _nodeId: 700003538753
+            project: winhc_eci_dev
+
+

src/main/java/com/winhc/dataworks/flow/touch/Main.java

@@ -141,7 +141,11 @@ public class Main {
                 } else {
                     String odpsCmdPath = commandLine.getOptionValue("odps");
                     dd.send(msg);
-                    bean.start(bizDate, jobs, odpsCmdPath);
+                    Long time = 90l;
+                    if (fileName.endsWith("step06.yaml")) {
+                        time = 60 * 6l;
+                    }
+                    bean.start(bizDate, jobs, odpsCmdPath, time);
                     // 指定job结束后发送通知
                     if (fileName.endsWith("step03.yaml")) {
                         SendJobStatus sendJobStatus = context.getBean(SendJobStatus.class);
@@ -165,13 +169,13 @@ public class Main {
     }
 
     @SneakyThrows
-    private void start(String bizDate, List<DataWorksFlowJob> jobs, String odpsCmdHome) {
+    private void start(String bizDate, List<DataWorksFlowJob> jobs, String odpsCmdHome, Long time) {
         //为所有项目空间启动守护线程
         String accessKeyId = dataWorksAccessProperties.getAccessKeyId();
         String accessKeySecret = dataWorksAccessProperties.getAccessKeySecret();
         Set<String> ps = jobs.stream().map(DataWorksFlowJob::getProject).collect(Collectors.toSet());
         for (String p : ps) {
-            new SparkDaemonThread(p, accessKeyId, accessKeySecret, odpsCmdHome, 90L).start();
+            new SparkDaemonThread(p, accessKeyId, accessKeySecret, odpsCmdHome, time).start();
         }
 
         //运行job，并接收失败参数，最大重试三次