From 9c22b73b2506413d4169889f4becfba486cee9c3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 28 三月 2025 19:57:31 +0800 Subject: [PATCH] 修改文档bug --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java index 4d6679b..97bd6bc 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java @@ -449,7 +449,7 @@ * @param end_lng 终点经度 * @return */ - public boolean createTrip(String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) { + public JSONObject createTrip(String vehicleId, Integer numberOfPassengers, String tripId, String start_lat, String start_lng, String end_lat, String end_lng) { String url = "https://fleetengine.googleapis.com/v1/providers/" + provider + "/trips?tripId=" + tripId; HttpRequest post = HttpUtil.createPost(url); Map<String, String> headers = new HashMap<>(); @@ -478,7 +478,7 @@ end_point.put("longitude", end_lng); dropoffPoint.put("point", end_point); body.put("dropoffPoint", dropoffPoint); - logger.info("创建行程请求:{}", body.toJSONString()); + logger.info("创建行程请求:{} {}", tripId, body.toJSONString()); HttpRequest request = post.body(body.toJSONString()); HttpResponse response = request.execute(); logger.info("创建行程结果:{}", response.body()); @@ -499,7 +499,6 @@ } } logger.error("创建行程异常: tripId={} body={}", tripId, response.body()); - return false; } /** * 返回结果 @@ -616,7 +615,7 @@ * "currentRouteSegmentTrafficVersion": "2024-05-27T02:05:37.941167Z" * } */ - return true; + return jsonObject; } @@ -698,7 +697,7 @@ dropoffPoint.put("point", end_point); body.put("dropoffPoint", dropoffPoint); } - logger.info("修改行程请求:{}", body.toJSONString()); + logger.info("修改行程请求:{} {}", tripId, body.toJSONString()); HttpRequest request = put.body(body.toJSONString()); HttpResponse response = request.execute(); logger.info("修改行程结果:{}", response.body()); @@ -717,6 +716,9 @@ redisUtil.remove("google_token"); return updateTrip(tripStatus, vehicleId, numberOfPassengers, tripId, start_lat, start_lng, end_lat, end_lng); } + } + if(code == 404){ + return true; } logger.error("修改行程异常: tripId={} body={}", tripId, response.body()); return false; @@ -857,6 +859,7 @@ headers.put("Content-Type", "application/json"); get.addHeaders(headers); + logger.info("查询行程请求:{} {}", tripId, url); HttpResponse response = get.execute(); logger.info("查询行程结果:{}", response.body()); JSONObject jsonObject = JSON.parseObject(response.body().replaceAll("@type", "type")); @@ -864,7 +867,7 @@ if(null != error){ Integer code = error.getInteger("code"); if(code == 404){ - return ""; + return null; } if(code == 401){ String status = error.getString("status"); -- Gitblit v1.7.1