From 62a844316074db7f08e4ea039d4b165e48108bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 1 Jun 2021 16:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E4=BB=BB=E5=8A=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/temp/shenjian/dingding/TaskExport.groovy | 5 +---- .../script/temp/shenjian/util/GaoDeUtils.groovy | 10 +++++----- .../java/com/fangjia/script/statistics/ApiUtil.java | 4 +++- .../main/java/com/fangjia/script/statistics/Task.java | 11 +++++++++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy index a86e1a959..1cc8d65b5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy @@ -49,13 +49,10 @@ public class TaskExport { Thread.sleep(60 * 1000) taskDetail = ApiUtil.getTaskDetail(task.getId()) } - if ("穆良书" == task.getResponse().getName() && task.getId() == "e3f81b0381b44696b06fb6242a44902f") { - print("穆良书") - } if (taskDetail.getRealityEndDate() != null && taskDetail.getRealityEndDate() > monthStartTime && taskDetail.getRealityEndDate() < endTime) { TaskPersonDTO dto = new TaskPersonDTO() dto.name = task.response.name - dto.project = "" + dto.project = task.project.name dto.taskName = task.name dto.score = org.apache.commons.lang3.StringUtils.isBlank(taskDetail.flowConten) ? 0d : Double.valueOf(taskDetail.flowConten) dto.workTime = com.fangjia.script.common.DataHandleUtils.getDoubleRound(0, Double.valueOf(taskDetail.workTime)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 3f234cc53..e16b6336a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -140,11 +140,11 @@ class GaoDeUtils { } else if (json && json.infocode && json.infocode == "10044") { //throw new RuntimeException("开发者的日访问量超限,被系统自动封停,第二天0:00会自动解封") // 多线程情况下还是exit有效果,抛异常不会停止程序 - //System.exit(1) - AmapPoi amapPoi = new AmapPoi() - amapPoi.id = "10044" - result.add(amapPoi) - break; + System.exit(1) +// AmapPoi amapPoi = new AmapPoi() +// amapPoi.id = "10044" +// result.add(amapPoi) +// break; } else if (json && json.infocode && json.infocode == "10004") { // 开发者的单位时间内(1分钟)访问量超限,被系统自动封停,下一分钟自动解封。 Thread.sleep(60000) 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 977bc2888..7c87580de 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 @@ -340,7 +340,9 @@ public class ApiUtil { JSONObject obj = JSONObject.parseObject(String.valueOf(result.get("data"))); detail = obj.toJavaObject(TaskDetail.class); } else if (code == 90001){ - throw new RuntimeException("姣忎釜浼佷笟璋冪敤鍗曚釜鎺ュ彛鐨勯鐜囦笉鍙秴杩�60娆�/鍒嗛挓锛屼細杩斿洖閿欒鐮�90001:getTaskDetail"); + Thread.sleep(1000 * 60); + return getTaskDetail(taskId); + //throw new RuntimeException("姣忎釜浼佷笟璋冪敤鍗曚釜鎺ュ彛鐨勯鐜囦笉鍙秴杩�60娆�/鍒嗛挓锛屼細杩斿洖閿欒鐮�90001:getTaskDetail"); } else if (code == 90009) { throw new RuntimeException("姣忎釜浼佷笟鍗曚釜鎺ュ彛姣忓ぉ鐨勬渶澶т笂闄愪负1000娆★紝鑻ヨ秴鍑轰細杩斿洖閿欒鐮�90009:getTaskDetail"); } diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/Task.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/Task.java index 9a0c728c4..78fd1a825 100644 --- a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/Task.java +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/Task.java @@ -32,6 +32,8 @@ public class Task { private FlowDTO flow; @JSONField(name = "createDate") private String createDate; + @JSONField(name = "project") + private ProjectDTO project; @NoArgsConstructor @Data @@ -61,4 +63,13 @@ public class Task { @JSONField(name = "userid") private String userid; } + + @NoArgsConstructor + @Data + public static class ProjectDTO { + @JSONField(name = "id") + private String id; + @JSONField(name = "proname") + private String name; + } }