From a40c2eb885bcdb697c2e16dae4f43cb6cd718973 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 11:28:03 +0800
Subject: [PATCH] 优化小区数据
---
service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java b/service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java
index f454481..84dbd91 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java
@@ -48,6 +48,7 @@
@Override
public ResultVo post(String url, JSONObject paramIn) {
+ url = getUrl(url);
HttpHeaders header = getHeaders(url, paramIn.toJSONString(), HttpMethod.POST);
HttpEntity<String> httpEntity = new HttpEntity<String>(paramIn.toJSONString(), header);
ResponseEntity<String> tokenRes = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
@@ -67,7 +68,7 @@
*/
private HttpHeaders getHeaders(String url, String param, HttpMethod method) {
HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.APP_ID.toLowerCase(), CommonConstant.HC_HARDWARE_APP_ID);
+ header.add(CommonConstant.APP_ID.toLowerCase(), MappingCache.getValue(IOT_DOMAIN, "APP_ID"));
header.add(CommonConstant.USER_ID.toLowerCase(), CommonConstant.ORDER_DEFAULT_USER_ID);
header.add(CommonConstant.TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
header.add(CommonConstant.REQUEST_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
@@ -88,7 +89,7 @@
String password = MappingCache.getValue(IOT_DOMAIN, "IOT_PASSWORD");
JSONObject param = new JSONObject();
param.put("username", userName);
- param.put("password", password);
+ param.put("passwd", password);
HttpHeaders header = new HttpHeaders();
header.add(CommonConstant.APP_ID.toLowerCase(), MappingCache.getValue(IOT_DOMAIN, "APP_ID"));
@@ -100,11 +101,11 @@
ResponseEntity<String> tokenRes = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
- if (tokenRes.getStatusCode() != HttpStatus.OK) {
+
+ JSONObject tokenObj = JSONObject.parseObject(tokenRes.getBody());
+ if (tokenObj.getIntValue("code") != 0) {
throw new IllegalArgumentException("鑾峰彇token澶辫触" + tokenRes.getBody());
}
- JSONObject tokenObj = JSONObject.parseObject(tokenRes.getBody());
-
if (!tokenObj.containsKey("token")) {
throw new IllegalArgumentException("鑾峰彇token澶辫触" + tokenRes.getBody());
}
@@ -124,7 +125,7 @@
return DEFAULT_IOT_URL + param;
}
- return url + url;
+ return url + param;
}
/**
--
Gitblit v1.8.0