From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 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 704a15a..cb51d17 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
@@ -12,6 +12,7 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -25,6 +26,7 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -75,7 +77,7 @@
* @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
* @param state 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中）
*/
- public void pushOrderState(Integer type, Integer uid, Integer orderId, Integer orderType, Integer state, Integer time, String audioUrl){
+ public void pushOrderState(Integer type, Integer uid, Integer orderId, Integer orderType, Integer state, Integer time, String audioUrl, String from){
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", 200);
jsonObject.put("msg", "SUCCESS");
@@ -85,6 +87,7 @@
map.put("orderType", orderType);
map.put("state", state);
map.put("audioUrl", audioUrl);
+ map.put("from", from);
jsonObject.put("data", map);
//调用推送
@@ -245,9 +248,11 @@
Integer oldState = 0;
Long startServiceTime = null;
Double servedMileage = null;
+ String tripId = "";
switch (orderType){
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
+ tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
if(orderPrivateCar == null){
this.removeTask(orderId, orderType);
}else{
@@ -262,6 +267,7 @@
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
+ tripId = redisUtil.getValue("trip" + orderTaxi.getUserId());
if(orderTaxi == null){
this.removeTask(orderId, orderType);
}else{
@@ -276,6 +282,7 @@
break;
case 3:
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
+ tripId = redisUtil.getValue("trip" + orderCrossCity.getUserId());
if(orderCrossCity == null){
this.removeTask(orderId, orderType);
}else{
@@ -289,6 +296,7 @@
break;
case 4:
OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+ tripId = redisUtil.getValue("trip" + orderLogistics.getUserId());
if(orderLogistics == null){
this.removeTask(orderId, orderType);
}else{
@@ -302,6 +310,7 @@
break;
case 5:
OrderLogistics orderLogistics1 = orderLogisticsService.selectById(orderId);
+ tripId = redisUtil.getValue("trip" + orderLogistics1.getUserId());
if(orderLogistics1 == null){
this.removeTask(orderId, orderType);
}else{
@@ -337,19 +346,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]));
- 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");//距离起点已经服务的里程
@@ -366,20 +375,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]));
- 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