优化指派逻辑

Pu Zhibing

2 天以前 9a66aa395b78b5df07058560eec181a66d6db2b9

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -15,6 +15,7 @@
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.GeodesyUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +46,9 @@

    @Autowired
    private GDMapElectricFenceUtil gdMapElectricFenceUtil;

    @Autowired
    private GeodesyUtil geodesyUtil;

    @Autowired
    private ICompanyCityService companyCityService;
@@ -105,13 +109,11 @@
            if(0 != count){
                continue;
            }
            String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
            String value = redisUtil.getValue("DRIVER" + 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]));
                double d = gdMapElectricFenceUtil.getDrivingRoute(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
                if(d < (distance * 1000)){
                Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
                Double wgs84 = distance1.get("WGS84");
                if(wgs84 < (distance * 1000)){
                    list.add(driver);
                }
            }