From 75de9bfb87e6829f4e880d49a65c6ca9b35bdaa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 十一月 2024 19:24:49 +0800
Subject: [PATCH] 自动数据上传修改
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
index ccdede4..5ce2365 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.util;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -124,13 +126,14 @@
header.put("Accept", "*/*");
header.put("Accept-Encoding", "gzip");
header.put("Accept-Charset", "utf-8");
+ System.err.println("订单发起==============================="+map);
String result = null;
try {
result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/orderCreate", map, header,"form").toString();
} catch (Exception e) {
e.printStackTrace();
}
- System.err.println("---------------------------订单发起接口----------------------：" + result);
+ System.err.println("--------------------------订单发起接口------------------------：" + result);
}
@@ -149,19 +152,24 @@
jsonObject.put("Longitude", Double.valueOf(value.split(",")[0]));//车辆经度
jsonObject.put("Latitude", Double.valueOf(value.split(",")[1]));//车辆纬度
jsonObject.put("Encrypt", 1);//坐标加密标识（1：GCJ-02测绘局标准，2：WGS84 GPS标准，3：BD-09百度标准，4：CGCS2000北斗标准，0：其他）
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证编号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证编号
jsonObject.put("DriverPhone", driver.getPhone());//驾驶员手机号
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("DistributeTime", new Date());//派单成功时间YYYYMMDDhhmmss
Map<String, Object> map = new HashMap<>();
map.put("orderMatch", jsonObject.toJSONString());
-
Map<String, String> header = new HashMap<>();
header.put("Connection", "keep-alive");
header.put("Content-Type", "application/x-www-form-urlencoded");
header.put("Accept", "*/*");
header.put("Accept-Encoding", "gzip");
header.put("Accept-Charset", "utf-8");
+ System.err.println("订单成功==============================="+map);
String result = null;
try {
result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/orderMatch", map, header,"form").toString();
@@ -182,7 +190,12 @@
String value = redisUtil.getValue("DRIVER" + driverId);
if(ToolUtil.isNotEmpty(value)){
JSONObject jsonObject = new JSONObject();
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证号
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("LoginTime", new Date());//车辆经营上线时间YYYYMMDDhhmmss
jsonObject.put("Longitude", Double.valueOf(value.split(",")[0]));//上线经度
@@ -217,7 +230,12 @@
String value = redisUtil.getValue("DRIVER" + driverId);
if(ToolUtil.isNotEmpty(value)){
JSONObject jsonObject = new JSONObject();
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证号
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("LogoutTime", new Date());//车辆经营下线时间YYYYMMDDhhmmss
jsonObject.put("Longitude", Double.valueOf(value.split(",")[0]));//下线经度
@@ -253,7 +271,12 @@
Car car = carService.selectById(orderPrivateCar.getCarId());
JSONObject jsonObject = new JSONObject();
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单号
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证号
jsonObject.put("FareType", query.get("id").toString());//运价类型编码
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("DepLongitude", Double.valueOf(orderPrivateCar.getBoardingLon()));//车辆出发经度
@@ -278,7 +301,6 @@
jsonObject.put("WaitTime", orderPrivateCar.getWait() * 60);//等待时间（秒）
Map<String, Object> map = new HashMap<>();
map.put("operateDepart", jsonObject.toJSONString());
-
Map<String, String> header = new HashMap<>();
header.put("Connection", "keep-alive");
header.put("Content-Type", "application/x-www-form-urlencoded");
@@ -337,12 +359,17 @@
Map<String, Object> query = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
Car car = carService.selectById(orderPrivateCar.getCarId());
ServerCarModel serverCarModel = serverCarModelMapper.selectById(orderPrivateCar.getServerCarModelId());
- TransactionDetails transactionDetails = transactionDetailsService.selectById(new EntityWrapper<TransactionDetails>().eq("orderType", 1).eq("orderId", orderId));
+ TransactionDetails transactionDetails = transactionDetailsService.selectOne(new EntityWrapper<TransactionDetails>().eq("orderType", 1).eq("orderId", orderId));
JSONObject jsonObject = new JSONObject();
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单号
jsonObject.put("OnArea", 530602);//上车位置行政区划代码
jsonObject.put("DriverName", driver.getName());//机动车驾驶员
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证号
jsonObject.put("FareType", query.get("id").toString());//运价类型编码（由网约车公司定义，与运价信息接口保持一街）
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("BookDepTime", orderPrivateCar.getTravelTime());//预计上车时间YYYYMMDDhhmmss
@@ -457,7 +484,12 @@
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ if (driver.getIdCard() == null){
+ return;
+ }else if (driver.getIdCard().isEmpty()){
+ return;
+ }
+ jsonObject.put("LicenseId", driver.getIdCard());//机动车驾驶证号
jsonObject.put("DriverRegionCode", 530602);//行政区划代码
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("PositionTime", new Date());//定位时间（时间戳）
@@ -471,7 +503,6 @@
jsonObject.put("OrderId", orderNum);//订单编号
Map<String, Object> map = new HashMap<>();
map.put("positionDriver", jsonObject.toJSONString());
-
Map<String, String> header = new HashMap<>();
header.put("Connection", "keep-alive");
header.put("Content-Type", "application/x-www-form-urlencoded");
--
Gitblit v1.7.1