yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bus/Taxi driver v2.9.0]未Taxi MAP260的DPQP轨迹预埋字段，待Mis8.30 DPQP轨迹管理上线后生效

Browse Source
This commit is contained in:
pangfan
2022-07-25 15:40:43 +08:00
parent 316c99f4c6
commit a86ab5f2ac
8 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
View File

@@ -22,6 +22,11 @@ public class BusRoutesResult {
public String txtFileMd5 = ""; //轨迹文件md5，默认“”
public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
public String csvFileUrlDPQP = ""; //轨迹文件下载的cos url，默认“”
public String csvFileMd5DPQP = ""; //轨迹文件md5，默认“”
public String txtFileUrlDPQP = ""; //打点文件下载的cos url，默认“”
public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“”
public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public int getLineId() {
return lineId;
@@ -54,6 +59,11 @@ public class BusRoutesResult {
", txtFileMd5='" + txtFileMd5 + '\'' +
", contrailSaveTime=" + contrailSaveTime +
", carModel='" + carModel + '\'' +
", csvFileUrlDPQP='" + csvFileUrlDPQP + '\'' +
", csvFileMd5DPQP='" + csvFileMd5DPQP + '\'' +
", txtFileUrlDPQP='" + txtFileUrlDPQP + '\'' +
", txtFileMd5DPQP='" + txtFileMd5DPQP + '\'' +
", contrailSaveTimeDPQP=" + contrailSaveTimeDPQP +
'}';
}
}

5
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
View File

@@ -522,7 +522,10 @@ public class BusOrderModel {
busRoutesResult.getLineId(),
busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5,
busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5,
busRoutesResult.contrailSaveTime, busRoutesResult.carModel);
busRoutesResult.contrailSaveTime, busRoutesResult.carModel,
busRoutesResult.csvFileUrlDPQP, busRoutesResult.csvFileMd5DPQP,
busRoutesResult.txtFileUrlDPQP, busRoutesResult.txtFileMd5DPQP,
busRoutesResult.contrailSaveTimeDPQP);
}
CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
+" startLatLon="+currentStation.getName()+"，endLatLon="+nextStation.getName());

21
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
View File

@@ -40,9 +40,9 @@ public class BusTrajectoryManager {
private Disposable mSendReqDisposable = null;
public BusTrajectoryManager() {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-1, "", "", "", "",
0, "");
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
"", "", "", "", 0, "",
"", "", "", "", 0);
}
/**
@@ -106,7 +106,10 @@ public class BusTrajectoryManager {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(routesResult.getLineId(),
routesResult.csvFileUrl, routesResult.csvFileMd5,
routesResult.txtFileUrl, routesResult.txtFileMd5,
routesResult.contrailSaveTime, routesResult.carModel);
routesResult.contrailSaveTime, routesResult.carModel,
routesResult.csvFileUrlDPQP, routesResult.csvFileMd5DPQP,
routesResult.txtFileUrlDPQP, routesResult.txtFileMd5DPQP,
routesResult.contrailSaveTimeDPQP);
} else {
mAutoPilotLine.setLineId(routesResult.getLineId());
mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl);
@@ -115,6 +118,11 @@ public class BusTrajectoryManager {
mAutoPilotLine.setStopMd5(routesResult.txtFileMd5);
mAutoPilotLine.setTimestamp(routesResult.contrailSaveTime);
mAutoPilotLine.setVehicleModel(routesResult.carModel);
mAutoPilotLine.setTrajUrl_dpqp(routesResult.csvFileUrlDPQP);
mAutoPilotLine.setTrajMd5_dpqp(routesResult.csvFileMd5DPQP);
mAutoPilotLine.setStopUrl_dpqp(routesResult.txtFileUrlDPQP);
mAutoPilotLine.setStopMd5_dpqp(routesResult.txtFileMd5DPQP);
mAutoPilotLine.setTimestamp_dpqp(routesResult.contrailSaveTimeDPQP);
}
}
}
@@ -128,6 +136,11 @@ public class BusTrajectoryManager {
mAutoPilotLine.setStopMd5("");
mAutoPilotLine.setTimestamp(0);
mAutoPilotLine.setVehicleModel("");
mAutoPilotLine.setTrajUrl_dpqp("");
mAutoPilotLine.setTrajMd5_dpqp("");
mAutoPilotLine.setStopUrl_dpqp("");
mAutoPilotLine.setStopMd5_dpqp("");
mAutoPilotLine.setTimestamp_dpqp(0);
}
private void startTrajReqLoop() {

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
View File

@@ -57,6 +57,11 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData {
public String txtFileMd5 = ""; //轨迹文件md5，默认“”
public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
public String csvFileUrlDPQP = ""; //轨迹文件下载的cos url，默认“”
public String csvFileMd5DPQP = ""; //轨迹文件md5，默认“”
public String txtFileUrlDPQP = ""; //打点文件下载的cos url，默认“”
public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“”
public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
// !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
public double travelDistance;

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
View File

@@ -894,7 +894,10 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
mCurrentOCHOrder.lineId,
mCurrentOCHOrder.csvFileUrl, mCurrentOCHOrder.csvFileMd5,
mCurrentOCHOrder.txtFileUrl, mCurrentOCHOrder.txtFileMd5,
mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel);
mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel,
mCurrentOCHOrder.csvFileUrlDPQP, mCurrentOCHOrder.csvFileMd5DPQP,
mCurrentOCHOrder.txtFileUrlDPQP, mCurrentOCHOrder.txtFileMd5DPQP,
mCurrentOCHOrder.contrailSaveTimeDPQP);
}
CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);

5
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java
View File

@@ -58,6 +58,11 @@ public class OrderQueryRespBean extends BaseData {
public String txtFileMd5 = ""; //轨迹文件md5，默认“”
public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
public String csvFileUrlDPQP = ""; //轨迹文件下载的cos url，默认“”
public String csvFileMd5DPQP = ""; //轨迹文件md5，默认“”
public String txtFileUrlDPQP = ""; //打点文件下载的cos url，默认“”
public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“”
public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
// !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
public double travelDistance;

5
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -901,7 +901,10 @@ public class TaxiModel {
mCurrentOCHOrder.lineId,
mCurrentOCHOrder.csvFileUrl, mCurrentOCHOrder.csvFileMd5,
mCurrentOCHOrder.txtFileUrl, mCurrentOCHOrder.txtFileMd5,
mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel);
mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel,
mCurrentOCHOrder.csvFileUrlDPQP, mCurrentOCHOrder.csvFileMd5DPQP,
mCurrentOCHOrder.txtFileUrlDPQP, mCurrentOCHOrder.txtFileMd5DPQP,
mCurrentOCHOrder.contrailSaveTimeDPQP);
}
CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters)

20
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
View File

@@ -42,9 +42,9 @@ public class TaxiTrajectoryManager {
private String mPrevOrderNo = "";
public TaxiTrajectoryManager() {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-1, "", "", "", "",
0, "");
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
"", "", "", "", 0, "",
"", "", "", "", 0);
}
/**
@@ -109,7 +109,9 @@ public class TaxiTrajectoryManager {
if (mAutoPilotLine == null) {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(order.lineId,
order.csvFileUrl, order.csvFileMd5, order.txtFileUrl, order.txtFileMd5,
order.contrailSaveTime, order.carModel);
order.contrailSaveTime, order.carModel,
order.csvFileUrlDPQP, order.csvFileMd5DPQP, order.txtFileUrlDPQP, order.txtFileMd5DPQP,
order.contrailSaveTimeDPQP);
} else {
mAutoPilotLine.setLineId(order.lineId);
mAutoPilotLine.setTrajUrl(order.csvFileUrl);
@@ -118,6 +120,11 @@ public class TaxiTrajectoryManager {
mAutoPilotLine.setStopMd5(order.txtFileMd5);
mAutoPilotLine.setTimestamp(order.contrailSaveTime);
mAutoPilotLine.setVehicleModel(order.carModel);
mAutoPilotLine.setTrajUrl_dpqp(order.csvFileUrlDPQP);
mAutoPilotLine.setTrajMd5_dpqp(order.csvFileMd5DPQP);
mAutoPilotLine.setStopUrl_dpqp(order.txtFileUrlDPQP);
mAutoPilotLine.setStopMd5_dpqp(order.txtFileMd5DPQP);
mAutoPilotLine.setTimestamp_dpqp(order.contrailSaveTimeDPQP);
}
}
}
@@ -131,6 +138,11 @@ public class TaxiTrajectoryManager {
mAutoPilotLine.setStopMd5("");
mAutoPilotLine.setTimestamp(0);
mAutoPilotLine.setVehicleModel("");
mAutoPilotLine.setTrajUrl_dpqp("");
mAutoPilotLine.setTrajMd5_dpqp("");
mAutoPilotLine.setStopUrl_dpqp("");
mAutoPilotLine.setStopMd5_dpqp("");
mAutoPilotLine.setTimestamp_dpqp(0);
}
private void startTrajReqLoop() {