From 62195dd503b22050266de2c93bd8105996054bca Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 1 Dec 2022 14:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=9B=BD=E5=AE=B6=E5=BA=93ap?= =?UTF-8?q?pkey=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/thread/AsyncDiDlHelper.java | 16 ++++--- .../com/glxp/api/admin/util/HttpClient.java | 45 +++++++++++++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/AsyncDiDlHelper.java b/api-admin/src/main/java/com/glxp/api/admin/thread/AsyncDiDlHelper.java index 4353925e..66debd68 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/AsyncDiDlHelper.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/AsyncDiDlHelper.java @@ -25,12 +25,16 @@ public class AsyncDiDlHelper { @Value("${UDI_SERVER_URL}") private String udiUrl; + + @Resource + HttpClient httpClient; + public List dlByTime(String udiUrl, int page, int limit, String updateTime) { Map paramMap = new HashMap<>(16); paramMap.put("page", page); paramMap.put("limit", limit); paramMap.put("updateTime", updateTime); - String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncUdi", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/udiwms/syncUdi", paramMap); try { BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -51,7 +55,7 @@ public class AsyncDiDlHelper { paramMap.put("page", page); paramMap.put("limit", limit); paramMap.put("updateTime", updateTime); - String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncCompany", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/udiwms/syncCompany", paramMap); try { BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -70,7 +74,7 @@ public class AsyncDiDlHelper { public List dlByDi(String deviceId) { Map paramMap = new HashMap<>(16); paramMap.put("deviceId", deviceId); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/serchDlByDi", paramMap); try { BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -92,7 +96,7 @@ public class AsyncDiDlHelper { public BaseResponse> dlByDiRes(String deviceId) { Map paramMap = new HashMap<>(16); paramMap.put("deviceId", deviceId); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/serchDlByDi", paramMap); try { BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -108,7 +112,7 @@ public class AsyncDiDlHelper { public BaseResponse> dlLastVersionByDi(String deviceId) { Map paramMap = new HashMap<>(16); paramMap.put("deviceId", deviceId); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/dlLastVersionByDi", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/dlLastVersionByDi", paramMap); try { BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -131,7 +135,7 @@ public class AsyncDiDlHelper { Map paramMap = new HashMap<>(16); paramMap.put("uuid", uuid); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/searchDlByUuid", paramMap); + String response = httpClient.mipsGetUdiHead(udiUrl + "/udidl/device/searchDlByUuid", paramMap); try { BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java index b9e24e6c..04fcd95e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java @@ -2,10 +2,15 @@ package com.glxp.api.admin.util; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -14,8 +19,16 @@ import java.util.Iterator; import java.util.Map; @Slf4j +@Service public class HttpClient { + + @Value("${UDI_APPID}") + private String appId; + @Value("${UDI_SECRET}") + private String appSecret; + + // public static String uCloudPost(String url, Object object) { // RestTemplate restTemplate = new RestTemplate(); // String json = JSONObject.toJSON(object).toString(); @@ -92,6 +105,38 @@ public class HttpClient { } + public String mipsGetUdiHead(String url, Map params) { + + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + headers.add("appId", appId); + headers.add("appSecret", appSecret); + StringBuffer stringBuffer = new StringBuffer(url); + if (params instanceof Map) { + Iterator iterator = ((Map) params).entrySet().iterator(); + if (iterator.hasNext()) { + stringBuffer.append("?"); + Object element; + while (iterator.hasNext()) { + element = iterator.next(); + Map.Entry entry = (Map.Entry) element; + if (entry.getValue() != null) { + stringBuffer.append(element).append("&"); + } + url = stringBuffer.substring(0, stringBuffer.length() - 1); + } + } + } else { + throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型"); + } + RestTemplate restTemplate = new RestTemplate(); + String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class); +// String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity(headers)); + return response.getBody(); + } + + public static String uCloudPostSmp(String url, Object object, String appKey, String secretKey) { RestTemplate restTemplate = new RestTemplate(); String json = JSONUtil.toJsonStr(object);