From 6598b47440f5be4adc1c793bbfc9f187be50a179 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 17:01:48 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java | 2 +-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java | 16 +++++++++++++++-
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 23 ++++++++---------------
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java | 13 +++----------
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java
index f82fba8..ff20422 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java
@@ -5,14 +5,18 @@
import com.supersavedriving.driver.modular.system.dao.AgentMapper;
import com.supersavedriving.driver.modular.system.dao.TBranchOfficeAreaMapper;
import com.supersavedriving.driver.modular.system.model.Agent;
+import com.supersavedriving.driver.modular.system.model.BranchOffice;
import com.supersavedriving.driver.modular.system.model.TBranchOfficeArea;
import com.supersavedriving.driver.modular.system.service.IAgentService;
+import com.supersavedriving.driver.modular.system.service.IBranchOfficeService;
+import com.supersavedriving.driver.modular.system.service.ITBranchOfficeAreaService;
import com.supersavedriving.driver.modular.system.warpper.OpenCityWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -24,6 +28,9 @@
@Autowired
private TBranchOfficeAreaMapper branchOfficeAreaMapper;
+ @Autowired
+ private IBranchOfficeService branchOfficeService;
+
/**
* 获取开通省市数据
* @return
@@ -31,7 +38,14 @@
*/
@Override
public List<OpenCityWarpper> queryOpenCity() throws Exception {
- List<TBranchOfficeArea> branchOfficeAreas = branchOfficeAreaMapper.selectList(new EntityWrapper<TBranchOfficeArea>());
+ List<BranchOffice> branchOffices = branchOfficeService.selectList(new EntityWrapper<BranchOffice>().eq("status", 1));
+ List<Integer> collect = new ArrayList<>();
+ if(branchOffices.size() == 0){
+ collect.add(-1);
+ }else{
+ collect = branchOffices.stream().map(BranchOffice::getId).collect(Collectors.toList());
+ }
+ List<TBranchOfficeArea> branchOfficeAreas = branchOfficeAreaMapper.selectList(new EntityWrapper<TBranchOfficeArea>().in("branchOfficeId", collect));
List<OpenCityWarpper> province = new ArrayList<>();
//遍历处理省级数据
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
index 81806ec..c945d55 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
@@ -41,7 +41,7 @@
private IDriverWorkService driverWorkService;
// 每秒执行一次的定时任务 接单大厅取消订单
- @Scheduled(fixedRate = 1000)
+ @Scheduled(fixedRate = 10000)
public void taskSecond(){
// 查询所有待接单订单
List<Order> list = new ArrayList<>();
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 b7090e1..d8b358b 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
@@ -15,12 +15,8 @@
import com.supersavedriving.user.modular.system.util.MallBook.model.*;
import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
-import com.supersavedriving.user.modular.system.util.juhe.WeatherUtil;
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;
@@ -37,13 +33,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.MathContext;
import java.math.RoundingMode;
-import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -81,8 +74,8 @@
@Autowired
private RedisUtil redisUtil;
- @Autowired
- private RedissonClient redissonClient;
+// @Autowired
+// private RedissonClient redissonClient;
@Autowired
private MongoTemplate mongoTemplate;
@@ -439,11 +432,11 @@
*/
@Override
public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
- RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
- boolean lock2 = lock1.tryLock(5, TimeUnit.SECONDS);
- if(!lock2){
- return ResultUtil.error("系统繁忙，请稍后重试");
- }
+// RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
+// boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
+// if(!lock2){
+// return ResultUtil.error("系统繁忙，请稍后重试");
+// }
try {
List<Integer> state = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 201, 401);
Order order = this.selectOne(new EntityWrapper<Order>().eq("userId", uid).eq("status", 1).in("state", state));
@@ -556,7 +549,7 @@
}catch (Exception e){
e.printStackTrace();
}finally {
- lock1.unlock();
+// lock1.unlock();
}
return ResultUtil.error("系统异常");
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
index 0e30250..0354893 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
@@ -1,17 +1,10 @@
package com.supersavedriving.user.modular.system.util;
-import com.supersavedriving.user.core.util.ToolUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Pipeline;
import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -103,7 +96,7 @@
int num1 = 1;
while (num1 <= 10){
try {
- Thread.sleep(3000);//等待3秒
+ Thread.sleep(1000);//等待3秒
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -132,7 +125,7 @@
int num1 = 1;
while (num1 <= 10){
try {
- Thread.sleep(3000);//等待3秒
+ Thread.sleep(1000);//等待1秒
} catch (InterruptedException e) {
e.printStackTrace();
}
--
Gitblit v1.7.1