From 574dd855d39d4b4ff19a63be869e07952e4620a6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 18:03:44 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
index 65f8086..25b1648 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
@@ -16,6 +16,7 @@
import com.doumee.core.utils.DateUtil;
import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
+ import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -52,7 +53,6 @@
public static String sign(String accessSecret, TreeMap<String, String> params, HttpMethod method) throws Exception {
String stringToSign = getStringToSign(params, method);
- System.out.println("StringToSign = [" + stringToSign + "]");
javax.crypto.Mac mac = javax.crypto.Mac.getInstance("HmacSHA1");
mac.init(new javax.crypto.spec.SecretKeySpec(accessSecret.getBytes(DEFAULT_CHARSET), "HmacSHA1"));
byte[] signData = mac.doFinal(stringToSign.getBytes(DEFAULT_CHARSET));
@@ -158,6 +158,7 @@
Collections.sort(list, (o1, o2) -> {
return (int) (o2.getTimeStamp() - o1.getTimeStamp()); //鎸夋椂闂村�掑簭
});
+ System.out.println(JSONObject.toJSONString(list));
return list;
}
@@ -183,9 +184,15 @@
//涓庝笅鏂圭殑HttpGet瀵瑰簲锛岄噰鐢ㄧ殑鏄疕ttpMethod.GET
String sign = sign(ACCESS_SECRET + "&", map, HttpMethod.GET);
url += "?Signature=" + specialUrlEncode(sign) + sortQueryStringTmp.toString();
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setSocketTimeout(5000) // 璁剧疆璇诲彇瓒呮椂鏃堕棿锛堝崟浣嶏細姣锛�
+ .setConnectTimeout(5000) // 璁剧疆杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細姣锛�
+ .build();
CloseableHttpClient httpClient = HttpClientBuilder.create().build();
//涓庝笂鏂圭殑HttpMethod.GET瀵瑰簲锛屼娇鐢℉ttpGet
HttpGet httpDelete = new HttpGet(url);
+ httpDelete.setConfig(requestConfig);
+ System.out.println(url);
CloseableHttpResponse response = httpClient.execute(httpDelete);
return EntityUtils.toString(response.getEntity());
}catch (Exception e){
@@ -224,16 +231,21 @@
return null;
}
public static CarsGpsResponse getLatestGpsInfo(String deviceCode) {
- String url = BASE_URL + "gps/latest/";
- TreeMap<String, String> BASE_PARAMS = getBaseParams();
- BASE_PARAMS.put("deviceCode", deviceCode);//璁惧鍨嬪彿绉橀挜
- String str = sendRequest(url,BASE_PARAMS);
- TypeReference typeReference =
- new TypeReference<BaseCarsResponse<CarsGpsResponse>>(){};
- BaseCarsResponse<CarsGpsResponse> result = JSONObject.parseObject(str, typeReference.getType());
- if(result!=null && Constants.equalsInteger(result.getStatus(),0)){
- return result.getData();
+ try {
+ String url = BASE_URL + "gps/latest/";
+ TreeMap<String, String> BASE_PARAMS = getBaseParams();
+ BASE_PARAMS.put("deviceCode", deviceCode);//璁惧鍨嬪彿绉橀挜
+ String str = sendRequest(url,BASE_PARAMS);
+ TypeReference typeReference =
+ new TypeReference<BaseCarsResponse<CarsGpsResponse>>(){};
+ BaseCarsResponse<CarsGpsResponse> result = JSONObject.parseObject(str, typeReference.getType());
+ if(result!=null && Constants.equalsInteger(result.getStatus(),0)){
+ return result.getData();
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
+
return null;
}
public static Map<String,Integer> getDeviceStatusList(List<String> code) {
--
Gitblit v1.9.3