xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/utils/map/FastDistanceCalculator.java
@@ -11,9 +11,15 @@ */ public static double distanceFast(double lat1, double lon1, double lat2, double lon2) { double x = (lon2 - lon1) * DEG_TO_RAD * Math.cos((lat1 + lat2) * 0.5 * DEG_TO_RAD); double y = (lat2 - lat1) * DEG_TO_RAD; return R * Math.sqrt(x * x + y * y)*1000; try { double x = (lon2 - lon1) * DEG_TO_RAD * Math.cos((lat1 + lat2) * 0.5 * DEG_TO_RAD); double y = (lat2 - lat1) * DEG_TO_RAD; return R * Math.sqrt(x * x + y * y)*1000; }catch (Exception e){ e.printStackTrace(); } return 0; } /** xp-robotaxi-itinerary-boot/src/main/resources/i18n/messages.properties
@@ -1,5 +1,6 @@ # 中文 city.not.found=获取城市信息失败 no.current.point=该站点已停止运营 no.current.region=当前区域未开通服务 path.not.found=获取导航信息失败 to.work=当前的接送点距离过近。建议步行前往 xp-robotaxi-itinerary-boot/src/main/resources/i18n/messages_en_US.properties
@@ -1,5 +1,6 @@ # English (US) city.not.found=city.not.found no.current.point=This site has ceased operations no.current.region=no.current.region path.not.found=Failed to obtain navigation information to.work=\ The current pick-up and drop-off points are too close to each other. It is recommended to walk there xp-robotaxi-itinerary-boot/src/main/resources/i18n/messages_zh_CN.properties
@@ -1,5 +1,6 @@ # 中文 city.not.found=获取城市信息失败 no.current.point=该站点已停止运营 no.current.region=当前区域未开通服务 path.not.found=获取导航信息失败 to.work=当前的接送点距离过近。建议步行前往 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java
@@ -40,17 +40,17 @@ long fileSize = file.getSize(); String fileId = UUID.randomUUID().toString(); //上传文件 aliOssService.uploadFile(file.getBytes(), fileId); String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true); FileUploadVO fileUploadVO = new FileUploadVO(); fileUploadVO.setId(fileId); fileUploadVO.setName(fileName); fileUploadVO.setUrl(downloadUrl); // aliOssService.uploadFile(file.getBytes(), fileId); // String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true); // FileUploadVO fileUploadVO = new FileUploadVO(); // fileUploadVO.setId(UUID.randomUUID().toString()); // fileUploadVO.setName("测试.jpg"); // fileUploadVO.setUrl("https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/images/552a3a31-e4dd-4a28-8748-fd8b87dd3055.png"); // fileUploadVO.setId(fileId); // fileUploadVO.setName(fileName); // fileUploadVO.setUrl(downloadUrl); FileUploadVO fileUploadVO = new FileUploadVO(); fileUploadVO.setId(UUID.randomUUID().toString()); fileUploadVO.setName("测试.jpg"); fileUploadVO.setUrl("https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/images/552a3a31-e4dd-4a28-8748-fd8b87dd3055.png"); return R.ok(fileUploadVO); } catch (Exception e) { System.err.println("上传文件失败"+e); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1101,7 +1101,10 @@ throw new ServiceException("订单状态错误", I18nKeyConstant.ORDER_STATUS_ERROR); } redisService.removeByPattern(order.getQueueName(),order.getOrderNumber()); try { redisService.removeByPattern(order.getQueueName(),order.getOrderNumber()); }catch (Exception e){ } //判断还原车辆状态 if(null == order.getVehicleId()){ Object cacheObject1 = redisService.getCacheObject("CREATE_ORDER:" + order.getId().toString());