From f5da7281ee8fed938198afcd33a2a619f08a37f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 14:27:26 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/pom.xml | 5 +++++
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 2 +-
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 13 ++++++++++---
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
index 0f9a731..112280e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -831,7 +831,7 @@
// 创建地图实例
var map = new AMap.Map("container", {
zoom: 13,
- center: [109.428071,24.326442],
+ center: [107.561768, 26.188572],
resizeEnable: true
});
// 添加地图加载完成事件监听
diff --git a/user/guns-admin/pom.xml b/user/guns-admin/pom.xml
index 6333410..27c4661 100644
--- a/user/guns-admin/pom.xml
+++ b/user/guns-admin/pom.xml
@@ -65,6 +65,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>3.16.8</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
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 1d8081f..b7090e1 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
@@ -19,6 +19,8 @@
import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
import com.supersavedriving.user.modular.system.warpper.*;
import io.swagger.models.auth.In;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -41,6 +43,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -77,6 +80,9 @@
@Autowired
private RedisUtil redisUtil;
+
+ @Autowired
+ private RedissonClient redissonClient;
@Autowired
private MongoTemplate mongoTemplate;
@@ -433,8 +439,9 @@
*/
@Override
public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
- boolean lock = redisUtil.lock(uid + "_travelOrder");
- if(!lock){
+ RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
+ boolean lock2 = lock1.tryLock(5, TimeUnit.SECONDS);
+ if(!lock2){
return ResultUtil.error("系统繁忙，请稍后重试");
}
try {
@@ -549,7 +556,7 @@
}catch (Exception e){
e.printStackTrace();
}finally {
- redisUtil.unlock(uid + "_travelOrder");
+ lock1.unlock();
}
return ResultUtil.error("系统异常");
}
--
Gitblit v1.7.1