From c91d30ae503c1a37c60a2fc83f610e032d56a26c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 25 七月 2023 09:49:58 +0800
Subject: [PATCH] 更新短信模板
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index c36a8ad..6055df0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -10,6 +10,8 @@
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
+import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,10 +57,8 @@
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);//计算距离
- double d = Double.valueOf(distance1.get("distance")).doubleValue();*/
- double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
- if(d < (distance * 1000)){
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]));
+ if(distancematrix.getDistance() < (distance * 1000)){
list.add(driver);
}
}
@@ -85,12 +85,13 @@
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);//计算距离
- double d = Double.valueOf(distance1.get("distance")).doubleValue();*/
- double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
- if(d < (distance * 1000)){
- list.add(driver);
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]));
+ if(null != distancematrix){
+ if(distancematrix.getDistance() < (distance * 1000)){
+ list.add(driver);
+ }
}
+
}
}
return list;
@@ -129,7 +130,7 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryBusiness(Integer uid) throws Exception {
+ public List<BaseWarpper> queryBusiness(Integer uid, Integer language) throws Exception {
List<DriverService> list = driverServiceMapper.queryBusiness(uid, null);
List<BaseWarpper> maps = new ArrayList<>();
for (DriverService d : list){
@@ -137,7 +138,7 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Private car" : "véhicules");
break;
case 2:
baseWarpper.setName("出租车");
@@ -146,7 +147,7 @@
baseWarpper.setName("跨城出行");
break;
case 4:
- baseWarpper.setName("同城小件物流");
+ baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
break;
case 5:
baseWarpper.setName("跨城小件物流");
--
Gitblit v1.7.1