From b1c572949997a5d82d9b609163ff280a1c49627d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 26 四月 2024 14:09:45 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
index de1317f..7f73839 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
@@ -50,23 +50,27 @@
log.debug("--HTTP-WEIGHT-璇锋眰杩斿洖--{}", responseText);
- String respJson;
- JSONObject resp;
- //璇存槑鏄疛SONP鏍煎紡-jsonpCallback({"content":""})
- if (responseText.indexOf("jsonpCallback") >= 0) {
- respJson = responseText.substring(responseText.indexOf("(") + 1, responseText.length() - 1);
- resp = JSONObject.parseObject(respJson);
- resp.put("code", 200);
- } else {
- respJson = responseText;
- resp = JSONObject.parseObject(respJson);
+ if(StringUtils.isEmpty(responseText)) {
+ return new BaseResp(500, "鍚庡彴鎵ц澶辫触");
}
- if (200 == (Integer) resp.get("code")) {
+ JSONObject resp;
+ String jsonStr;
+ //璇存槑鏄疛SONP鏍煎紡-jsonpCallback({"content":""})
+ if (responseText.indexOf("jsonpCallback") >= 0) {
+ jsonStr = responseText.substring(responseText.indexOf("(") + 1, responseText.length() - 1);
+ resp = JSONObject.parseObject(jsonStr);
+ resp.put("code", "200");
+ } else {
+ jsonStr = responseText;
+ resp = JSONObject.parseObject(jsonStr);
+ }
+
+ if ("200".equals(resp.get("code"))) {
if (null == resp.get("content") || "".equals(resp.get("content"))) {
reqData.setWeight(0.0);
} else {
- reqData.setWeight((Double) resp.get("content"));
+ reqData.setWeight(Double.valueOf(resp.get("content")+""));
}
}
@@ -75,7 +79,7 @@
gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportWeightData(reqData);
}
} catch (Exception e) {
- log.error("--------------鍦扮-HTTP鍗忚鎵ц寮傚父----{}", e.getMessage());
+ log.error("--------------鍦扮-HTTP鍗忚鎵ц寮傚父----{}", e);
}
return new BaseResp(500, "鍚庡彴鎵ц澶辫触");
}
--
Gitblit v1.9.3