From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 5f4a036..e687179 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -88,6 +88,7 @@
for(Driver driver : drivers){
String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
if(null != value){
+// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
double d = Double.valueOf(distance1.get("WGS84")).doubleValue();
if(d < (distance * 1000)){
@@ -98,22 +99,6 @@
return list;
}
- @Override
- public List<Driver> queryIdleDriver1(Integer type, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
- List<Driver> drivers = driverMapper.queryIdleDriver1(type, companyId);
- List<Driver> list = new ArrayList<>();
- for(Driver driver : drivers){
- String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
- if(null != value){
- Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
- double d = Double.valueOf(distance1.get("WGS84")).doubleValue();
- if(d < (distance * 1000)){
- list.add(driver);
- }
- }
- }
- return list;
- }
/**
* 根据订单id获取司机数据
@@ -158,7 +143,7 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName("快车");
+ baseWarpper.setName("专车");
break;
case 2:
baseWarpper.setName("出租车");
--
Gitblit v1.7.1