From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
index efe89bc..b2e3a23 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.system.service.IOrderPositionService;
import com.stylefeng.guns.modular.system.service.ITransactionDetailsService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -38,28 +39,28 @@
@Resource
private SystemPriceMapper systemPriceMapper;
-
+
@Autowired
private IDriverService driverService;
-
+
@Autowired
private IOrderPositionService orderPositionService;
-
+
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
- @Autowired
- private RedisUtil redisUtil;
-
+
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
@Resource
private ServerCarModelMapper serverCarModelMapper;
-
+
@Autowired
private ITransactionDetailsService transactionDetailsService;
-
+
@Autowired
private GeodesyUtil geodesyUtil;
-
+
private String path = "http://120.77.11.218:8868/";
@@ -137,7 +138,7 @@
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
Car car = carService.selectById(orderPrivateCar.getCarId());
- String value = redisUtil.getValue("DRIVER" + orderPrivateCar.getDriverId());
+ String value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + orderPrivateCar.getDriverId());
JSONObject jsonObject = new JSONObject();
jsonObject.put("Address", 450204);//发起地行政区划代码
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单编号
@@ -169,7 +170,7 @@
public void operateLogin(Integer driverId){
Driver driver = driverService.selectById(driverId);
Car car = carService.selectById(driver.getCarId());
- String value = redisUtil.getValue("DRIVER" + driverId);
+ String value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + driverId);
if(ToolUtil.isNotEmpty(value)){
JSONObject jsonObject = new JSONObject();
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
@@ -200,7 +201,7 @@
public void operateLogout(Integer driverId){
Driver driver = driverService.selectById(driverId);
Car car = carService.selectById(driver.getCarId());
- String value = redisUtil.getValue("DRIVER" + driverId);
+ String value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + driverId);
if(ToolUtil.isNotEmpty(value)){
JSONObject jsonObject = new JSONObject();
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
--
Gitblit v1.7.1