From 5e3dec02d94aeb5c021569b7dfdf894e6641ad82 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 11:27:44 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java | 9 +++++++++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java | 2 +-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 2 +-
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java | 2 +-
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 5 ++++-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index deefb9e..b668aac 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -629,7 +629,7 @@
Double lat = driverPositionWarpper.getLat();
Integer driverId = driverPositionWarpper.getDriverId();
Integer orderId = driverPositionWarpper.getOrderId();
- redisUtil.setStrValue("daijia_DRIVER" + driverId, lon + "," + lat, 30);
+ redisUtil.setStrValue("daijia:DRIVER" + driverId, lon + "," + lat, 30);
Query query = Query.query(Criteria.where("driverId").is(driverId));
Location old = this.mongoTemplate.findOne(query, Location.class);
if (Objects.isNull(old)) {
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
index 784ee10..7359816 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
@@ -28,7 +28,7 @@
Logger logger = LoggerFactory.getLogger("ServiceLog");
- private final String socket_uri = "http://192.168.110.111:6000";
+ private final String socket_uri = "http://192.168.110.85:6000";
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 010f109..9d9dda7 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -532,7 +532,10 @@
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}else{
//推单
- pushOrder(order.getId());
+ Order finalOrder = order;
+ new Thread(()->{
+ pushOrder(finalOrder.getId());
+ }).start();
}
}
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
index 8520ae6..7362a72 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
@@ -13,7 +13,7 @@
@Slf4j
public class AppUserUtil {
- private static String url = "http://192.168.110.85:5000/user-server";
+ private static String url = "http://192.168.110.106:5000/user-server";
/**
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
index 5fa10e6..e3dac6c 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
@@ -53,6 +53,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -87,6 +88,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -128,6 +130,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -162,6 +165,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -199,6 +203,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -227,6 +232,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -270,6 +276,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -308,6 +315,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -347,6 +355,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id.toString());
params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
--
Gitblit v1.7.1