From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 1a63250..1179c11 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -345,19 +345,19 @@
if((state == 2 || state == 3 || state == 4) || (oldState != null && (oldState == 2 || oldState == 3 || oldState == 4))){//前往预约地
String d = "0";
String t = "0";
- if(ToolUtil.isNotEmpty(value) && ToolUtil.isNotEmpty(startLonLat)){
- String[] split = value.split(",");
- String[] split1 = startLonLat.split(",");
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), Double.valueOf(split1[1]), Double.valueOf(split1[0]), tripId);
- if(null == distancematrix){
- System.err.println("地图获取距离出错");
- }else{
- d = distancematrix.getDistance().toString();//距离m
- t = distancematrix.getDuration().toString();//时间s
- }
- }
- d = new BigDecimal(d).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
- t = new BigDecimal(t).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+// if(ToolUtil.isNotEmpty(value) && ToolUtil.isNotEmpty(startLonLat)){
+// String[] split = value.split(",");
+// String[] split1 = startLonLat.split(",");
+// DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), Double.valueOf(split1[1]), Double.valueOf(split1[0]), tripId);
+// if(null == distancematrix){
+// System.err.println("地图获取距离出错");
+// }else{
+// d = distancematrix.getDistance().toString();//距离m
+// t = distancematrix.getDuration().toString();//时间s
+// }
+// }
+// d = new BigDecimal(d).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+// t = new BigDecimal(t).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
map.put("reservationMileage", d);//当前位置距离预约点的剩余里程
map.put("reservationTime", t);//当前位置距离预约点的剩余分钟
map.put("servedMileage", "0");//距离起点已经服务的里程
@@ -374,20 +374,20 @@
String d = "0";
String t = "0";
- if(ToolUtil.isNotEmpty(value) && ToolUtil.isNotEmpty(endLonLat)){
- String[] split = value.split(",");
- String[] split1 = endLonLat.split(",");
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), Double.valueOf(split1[1]), Double.valueOf(split1[0]), tripId);
- if(null == distancematrix){
- System.err.println("地图获取距离出错");
- }else{
- d = distancematrix.getDistance().toString();//距离m
- t = distancematrix.getDuration().toString();//时间s
- }
- }
-
- d = new BigDecimal(d).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
- t = new BigDecimal(t).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+// if(ToolUtil.isNotEmpty(value) && ToolUtil.isNotEmpty(endLonLat)){
+// String[] split = value.split(",");
+// String[] split1 = endLonLat.split(",");
+// DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), Double.valueOf(split1[1]), Double.valueOf(split1[0]), tripId);
+// if(null == distancematrix){
+// System.err.println("地图获取距离出错");
+// }else{
+// d = distancematrix.getDistance().toString();//距离m
+// t = distancematrix.getDuration().toString();//时间s
+// }
+// }
+//
+// d = new BigDecimal(d).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+// t = new BigDecimal(t).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
map.put("laveMileage", d);//距离终点剩余未服务的里程数
map.put("laveTime", t);//距离终端剩余未服务的预计时间
}
--
Gitblit v1.7.1