From 2c638a508edf713faeda60cae92ae92cc65eb511 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 28 十一月 2024 15:17:33 +0800
Subject: [PATCH] Add children list to PdaResource and enhance AuthController
---
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
index 5cf9ae2..4dff4fc 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
@Slf4j
@Service
@@ -104,18 +105,18 @@
}
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
- if (true){
- apiLogService.save(
- namespace,
- url + path,
- appkey,
- ip,
- JSON.toJSONString(JSONObject.toJSONString(requestParam)),
- "",
- true
- );
- return 0;
- }
+// if (true){
+// apiLogService.save(
+// namespace,
+// url + path,
+// appkey,
+// ip,
+// JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+// "",
+// true
+// );
+// return 0;
+// }
String response = "";
boolean success = false;
@@ -123,6 +124,7 @@
response = new HttpHandler.Builder()
.setUri(url)
.setPath(path)
+ .setTimeout(30, TimeUnit.SECONDS)
.setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
@@ -130,13 +132,16 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
+ //TODO 寮犺秴
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return 1;
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1