From 5ff9f9e7aa7722cde48eb2b3ba49d7bc2e61547b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 13 八月 2025 10:34:37 +0800
Subject: [PATCH] bug修改
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 57ce1a4..246b928 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -14,11 +14,14 @@
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {
@@ -61,6 +64,8 @@
if(d < (distance * 1000)){
list.add(driver);
}
+ }else{
+ System.err.println(driver.getName() + "-----------------没有上传经纬度----------------");
}
}
return list;
@@ -87,7 +92,8 @@
if(null != value){
/*Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
double d = Double.valueOf(distance1.get("distance")).doubleValue();*/
- double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
+// double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
+ double d = gdMapElectricFenceUtil.getDrivingRoute(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
if(d < (distance * 1000)){
list.add(driver);
}
@@ -156,4 +162,27 @@
}
return maps;
}
+
+ @Override
+ public List<Driver> queryDriverLimitTen(Integer type, Double lon, Double lat) {
+ List<Driver> drivers = driverMapper.queryIdleDriver(type, null);
+ if(CollectionUtils.isEmpty(drivers)){
+ return new ArrayList<>();
+ }
+ for (Driver driver : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver.getId());
+ if(null != value){
+ double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
+ driver.setLon(Double.parseDouble(value.split(",")[0]));
+ driver.setLat(Double.parseDouble(value.split(",")[1]));
+ driver.setDistance(d);
+ }
+ }
+ if(drivers.size() > 10){
+ drivers.sort(Comparator.comparing(Driver::getDistance));
+ return drivers.stream().limit(10).collect(Collectors.toList());
+ }else {
+ return drivers;
+ }
+ }
}
--
Gitblit v1.7.1