From eca628115f9ac473baaaa694131cb0f17a3c2a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 11 May 2021 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=B6=85=E9=99=90=E5=90=8E?= =?UTF-8?q?=E7=9D=A1=E7=9C=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shenjian/statistics/ProjectExport.groovy | 5 ++++- .../shenjian/statistics/ScoreExport.groovy | 4 +++- .../shenjian/statistics/TaskExport.groovy | 4 +++- .../fangjia/script/statistics/ApiUtil.java | 20 ++++++++++++++----- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy index 2bd88e38b..0a243b841 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy @@ -22,6 +22,8 @@ class ProjectExport { export() } + + static void export() { List> mergeData = new ArrayList<>() def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; @@ -62,7 +64,8 @@ class ProjectExport { TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) if (taskDetail == null) { print("当前任务taskDetail为空:" + task) - continue; + Thread.sleep(60 * 1000) + taskDetail = ApiUtil.getTaskDetail(task.getId()) } if (taskDetail.getRealityEndDate() != null && taskDetail.getRealityEndDate() > monthStartTime && taskDetail.getRealityEndDate() < endTime) if (taskDetail.getFlowConten() != null) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy index 81b26e748..58285190c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy @@ -61,7 +61,9 @@ public class ScoreExport { // 获取计划时间在当月的任务 TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) if (taskDetail == null) { - continue; + print("当前任务taskDetail为空:" + task) + Thread.sleep(60 * 1000) + taskDetail = ApiUtil.getTaskDetail(task.getId()) } if (taskDetail.getRealityEndDate() != null && taskDetail.getRealityEndDate() > monthStartTime && taskDetail.getRealityEndDate() < endTime) { boolean find = false diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy index 57e76d265..664b98e00 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy @@ -41,7 +41,9 @@ class TaskExport { // 获取计划时间在当月的任务 TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) if (taskDetail == null) { - continue; + print("当前任务taskDetail为空:" + task) + Thread.sleep(60 * 1000) + taskDetail = ApiUtil.getTaskDetail(task.getId()) } if ("穆良书" == task.getResponse().getName() && task.getId() == "e3f81b0381b44696b06fb6242a44902f") { print("穆良书") diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java index cf3128b61..977bc2888 100644 --- a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java @@ -292,12 +292,17 @@ public class ApiUtil { param.put("corpid", corpId); param.put("body", body); JSONObject result = ApiUtil.post("https://api.antbim.net/ant_api/task/getTaskListByPerson", param); - if ((Integer)result.get("code") == 0) { + int code = (Integer)result.get("code"); + if (code == 0) { if ((Integer)JSONObject.parseObject(String.valueOf(result.get("data"))).get("count") > 0) { JSONArray jsonArray = JSONObject.parseObject(String.valueOf(result.get("data"))).getJSONArray("list"); tasks = jsonArray.toJavaList(Task.class); } - } + } else if (code == 90001){ + throw new RuntimeException("姣忎釜浼佷笟璋冪敤鍗曚釜鎺ュ彛鐨勯鐜囦笉鍙秴杩�60娆�/鍒嗛挓锛屼細杩斿洖閿欒鐮�90001:listTaskByPerson"); + } else if (code == 90009) { + throw new RuntimeException("姣忎釜浼佷笟鍗曚釜鎺ュ彛姣忓ぉ鐨勬渶澶т笂闄愪负1000娆★紝鑻ヨ秴鍑轰細杩斿洖閿欒鐮�90009:listTaskByPerson"); + } } catch (Exception ex) { ex.printStackTrace(); } @@ -330,10 +335,15 @@ public class ApiUtil { param.put("corpid", corpId); param.put("body", body); JSONObject result = ApiUtil.post("https://api.antbim.net/ant_api/task/getTaskDetail", param); - if ((Integer)result.get("code") == 0) { + int code = (Integer)result.get("code"); + if (code == 0) { JSONObject obj = JSONObject.parseObject(String.valueOf(result.get("data"))); detail = obj.toJavaObject(TaskDetail.class); - } + } else if (code == 90001){ + throw new RuntimeException("姣忎釜浼佷笟璋冪敤鍗曚釜鎺ュ彛鐨勯鐜囦笉鍙秴杩�60娆�/鍒嗛挓锛屼細杩斿洖閿欒鐮�90001:getTaskDetail"); + } else if (code == 90009) { + throw new RuntimeException("姣忎釜浼佷笟鍗曚釜鎺ュ彛姣忓ぉ鐨勬渶澶т笂闄愪负1000娆★紝鑻ヨ秴鍑轰細杩斿洖閿欒鐮�90009:getTaskDetail"); + } } catch (Exception e) { e.printStackTrace(); } @@ -344,7 +354,7 @@ public class ApiUtil { //List projects = ApiUtil.listProject(); //System.out.println(ApiUtil.listTaskByProject("e7caf92da7be4c529c8733cbb196173e", "2021-04-01", "2021-05-15", 0, 50)); //ApiUtil.listProjectLabel("e7caf92da7be4c529c8733cbb196173e"); - System.out.println(ApiUtil.getTaskDetail("e3f81b0381b44696b06fb6242a44902f")); + System.out.println(ApiUtil.getTaskDetail("be85282dc57d46e3a36fc0801107e605")); //System.out.println(ApiUtil.getTaskDetail("d08c7c2c852048aebc8aa59d48cfbd21")); //System.out.println(ApiUtil.listTaskByPerson("2021-04-01 00:00:00", "2021-04-30 23:59:59")); // int limitStart = 0;