对接gps

songhua-admin/src/main/java/com/songhua/web/controller/gps/gpsController.java

@@ -25,6 +25,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.songhua.common.core.domain.AjaxResult.error;
+import static com.songhua.common.core.domain.AjaxResult.success;
 
 
 @Slf4j
@@ -42,7 +43,7 @@ public class gpsController {
      * 获取访问令牌
      */
     @GetMapping("/ship")
-    public String getToken() {
+    public AjaxResult getToken() {
         Date date = new Date();
         String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
         String dateStr = format.replace(" ", "%20");
@@ -86,7 +87,7 @@ public class gpsController {
                 reader.close();
                 // 打印响应内容
                 System.out.println(JSONObject.parseObject(response.toString()));
-                return JSONObject.parseObject(response.toString()).getString("access_token");
+                return success(JSONObject.parseObject(response.toString()).get("access_token"));
             } else {
                 log.error("获取访问令牌接口返回错误代码:{}", responseCode);
             }
@@ -105,13 +106,13 @@ public class gpsController {
      */
     @GetMapping("/shipRoute")
     public AjaxResult getEquipment() {
-        String token = getToken();
+        AjaxResult result = getToken();
         Date date = new Date();
         String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
         Map<String, String> configMap = getStringStringMap();
         String dateStr = format.replace(" ", "%20");
         String sign = MD5Encryptor.md5EncryptToUppercase(configMap.get("app_secret") +
-                "access_token" + token +
+                "access_token" + result.get("data") +
                 "app_key" + configMap.get("app_key") +
                 "dev_key59346d400236ab95e95193f35f3df6a4" +
                 "fieldsdid,activeGpsDataformatjsonlimit-1mapBAIDU" +
@@ -124,7 +125,7 @@ public class gpsController {
                 "&format=json&" +
                 "app_key=" +
                 configMap.get("app_key") +
-                "&v=2.0&sign_method=md5&method=wicare.device.list&dev_key=59346d400236ab95e95193f35f3df6a4&access_token=" + token +
+                "&v=2.0&sign_method=md5&method=wicare.device.list&dev_key=59346d400236ab95e95193f35f3df6a4&access_token=" + result.get("data")+
                 "&map=BAIDU&fields=did,activeGpsData&sorts=did&page=did&page_no=1&limit=-1&sign=" +
                 sign;
         try {