From 1569ec5a8a0f8d2cccb1c18ce78658a3e358b2d8 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 24 九月 2025 16:44:44 +0800 Subject: [PATCH] 更新代码 --- UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java | 4 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 81 ++++++------ UserZYTravel/guns-admin/pom.xml | 6 + UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 179 +++++++++++++++++++++++++++++ UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GeodesyUtil.java | 75 ++++++++++++ 5 files changed, 304 insertions(+), 41 deletions(-) diff --git a/UserZYTravel/guns-admin/pom.xml b/UserZYTravel/guns-admin/pom.xml index 435b154..b3204cc 100644 --- a/UserZYTravel/guns-admin/pom.xml +++ b/UserZYTravel/guns-admin/pom.xml @@ -209,6 +209,12 @@ <version>4.39.186.ALL</version> <scope>compile</scope> </dependency> + <!-- 计算两坐标间的直线距离 --> + <dependency> + <groupId>org.gavaghan</groupId> + <artifactId>geodesy</artifactId> + <version>1.1.3</version> + </dependency> </dependencies> diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java index d1cded1..8b8cff2 100644 --- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java +++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java @@ -25,6 +25,8 @@ import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService; import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -55,6 +57,8 @@ @Service public class OrderPrivateCarServiceImpl extends ServiceImpl<OrderPrivateCarMapper, OrderPrivateCar> implements IOrderPrivateCarService { + + Logger logger = LoggerFactory.getLogger(OrderPrivateCarServiceImpl.class); @Resource private OrderPrivateCarMapper orderPrivateCarMapper; @@ -154,6 +158,9 @@ @Autowired private GDMapElectricFenceUtil gdMapElectricFenceUtil; + + @Autowired + private GeodesyUtil geodesyUtil; @Autowired private IOrderPositionService orderPositionService; @@ -225,10 +232,10 @@ if(orderPrivateCars.size() > 0){ return ResultUtil.error("有未完成的订单"); } - List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11); - if(list.size() > 0){ - return ResultUtil.error("有未完成的订单"); - } +// List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11); +// if(list.size() > 0){ +// return ResultUtil.error("有未完成的订单"); +// } orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11); if(orderPrivateCars.size() > 0 && reservation == 2){ @@ -244,10 +251,10 @@ } - list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11); - if(list.size() > 0 && reservation == 2){ - return ResultUtil.error("有未完成的订单"); - } +// list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11); +// if(list.size() > 0 && reservation == 2){ +// return ResultUtil.error("有未完成的订单"); +// } startAddress = startAddress.replaceAll("& #40;", "("); startAddress = startAddress.replaceAll("& #41;", ")"); @@ -323,7 +330,11 @@ orderPrivateCar.setSnatchOrderTime(new Date()); driver2.setState(3); driverService.updateById(driver2); + serverCarModelId = query1.getServerCarModelId(); } + long timeMillis1 = System.currentTimeMillis(); + logger.info("第一段用时:" + (timeMillis1 - timeMillis)); + timeMillis = timeMillis1; // 查询城市的订单额度 OpenCity openCity = openCityService.selectOne(new EntityWrapper<OpenCity>() .eq("code", cityCode) @@ -340,30 +351,17 @@ } // 查询预估价格 - ResultUtil<List<ServerCarModelWarpper>> listResultUtil = serverCarModelService.queryServerCarModel(startLon + "," + startLat, endLon + "," + endLat, 1); - List<ServerCarModelWarpper> data = listResultUtil.getData(); - if(Objects.isNull(serverCarModelId)){ - //获取经营业务 - CarService query = new CarService(); - query.setCarId(driver2.getCarId()); - CarService service = carServiceMapper.selectOne(query); - if(Objects.nonNull(service)){ - serverCarModelId = service.getServerCarModelId(); - } + ResultUtil<ServerCarModelWarpper> listResultUtil = serverCarModelService.queryServerCarModel1(serverCarModelId, startLon + "," + startLat, endLon + "," + endLat, 1); + if(200 != listResultUtil.getCode()){ + return ResultUtil.error(listResultUtil.getMsg()); } - Integer finalServerCarModelId = serverCarModelId; - data = data.stream().filter(e -> finalServerCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList()); - if(Objects.nonNull(openCity) && !CollectionUtils.isEmpty(data) && BigDecimal.valueOf(data.get(0).getAmount()).compareTo(openCity.getOrderMagnitude()) > 0){ + ServerCarModelWarpper data = listResultUtil.getData(); + if(Objects.nonNull(openCity) && BigDecimal.valueOf(data.getAmount()).compareTo(openCity.getOrderMagnitude()) > 0){ orderPrivateCar.setIsReassign(1); orderPrivateCar.setIsDelete(1); orderPrivateCar.setState(7); - if(orderSource == 2){ - orderPrivateCar.setOrderMoney(data.get(0).getAmount()); - orderPrivateCar.setEstimatedPrice(data.get(0).getAmount()); - }else { - orderPrivateCar.setOrderMoney(data.get(carIndex).getAmount()); - orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount()); - } + orderPrivateCar.setOrderMoney(data.getAmount()); + orderPrivateCar.setEstimatedPrice(data.getAmount()); orderPrivateCar.setPayMethod(0); this.insert(orderPrivateCar); BaseWarpper baseWarpper = new BaseWarpper(); @@ -373,13 +371,7 @@ baseWarpper.setAmount(orderPrivateCar.getOrderMoney()); return ResultUtil.success(baseWarpper); }else { - if(orderSource == 2){ - if(!CollectionUtils.isEmpty(data)){ - orderPrivateCar.setEstimatedPrice(data.get(0).getAmount()); - } - }else { - orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount()); - } + orderPrivateCar.setEstimatedPrice(data.getAmount()); orderPrivateCar.setIsReassign(1); orderPrivateCar.setIsDelete(1); orderPrivateCar.setPayMethod(1); @@ -395,7 +387,9 @@ } }).start(); } - + long timeMillis2 = System.currentTimeMillis(); + logger.info("第二段用时:" + (timeMillis2 - timeMillis)); + timeMillis = timeMillis2; // TODO: 2021/5/11 修改,根据后台设定的派单范围查询范围内有无司机,将单子指派给距离最近的司机(距离相同随机取),范围内没有司机再进行推单流程 if(orderPrivateCar.getState() == 1){ @@ -458,11 +452,11 @@ for (Driver driver : ds) { String value = redisUtil.getValue("DRIVER" + driver.getId()); if (null != value) { - Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1);//计算距离 - Integer d = Integer.valueOf(distance1.get("distance")); - if ((0 == m && null == dr) || (d.intValue() < m.intValue())) { + Map<String, Double> distance = geodesyUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value); + Double wgs84 = distance.get("WGS84"); + if ((0 == m && null == dr) || (wgs84.intValue() < m.intValue())) { dr = driver; - m = d; + m = wgs84.intValue(); } } } @@ -507,7 +501,9 @@ } } } - + long timeMillis3 = System.currentTimeMillis(); + logger.info("第三段用时:" + (timeMillis3 - timeMillis)); + timeMillis = timeMillis3; //推单操作 if(orderPrivateCar.getState() == 1){ @@ -519,6 +515,9 @@ baseWarpper.setState(orderPrivateCar.getState()); baseWarpper.setId(orderPrivateCar.getId()); baseWarpper.setPayMethod(1); + long timeMillis4 = System.currentTimeMillis(); + logger.info("第四段用时:" + (timeMillis4 - timeMillis)); + timeMillis = timeMillis4; return ResultUtil.success(baseWarpper); } } diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java index de7da0c..eeb2db2 100644 --- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java +++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java @@ -22,6 +22,10 @@ ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type) throws Exception; + + ResultUtil<ServerCarModelWarpper> queryServerCarModel1(Integer serverCarModelId, String startLonLat, String endLonLat, Integer type) throws Exception; + + /** * 获取业务类型对应的所有车型 * @param type diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java index 8fe0995..c05620a 100644 --- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java +++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java @@ -83,6 +83,34 @@ } + + @Override + public ResultUtil<ServerCarModelWarpper> queryServerCarModel1(Integer serverCarModelId, String startLonLat, String endLonLat, Integer type) throws Exception { + //查找与起点匹配的企业(经营范围) + Map<String, String> geocode = gdMapGeocodingUtil.geocode(startLonLat.split(",")[0], startLonLat.split(",")[1]); + Company query = companyCityService.query(geocode.get("districtCode")); + if(null == query){ + return ResultUtil.error("起点暂无企业提供服务"); + } + Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLonLat, endLonLat, 1); + if(null == distance){ + return ResultUtil.error("获取预估距离出错"); + } + String distance1 = distance.get("distance");//距离(米) + double distance1_ = Double.valueOf(distance1).doubleValue(); + String duration = distance.get("duration");//时间(秒) + long duration_ = Long.valueOf(duration).longValue(); + + ServerCarModelWarpper price = this.getPrice(serverCarModelId, query.getId(), distance1_, duration_, 0, 1); + if(null == price){ + return ResultUtil.error("未获取到可服务的车型"); + } + return ResultUtil.success(price); + } + + + + /** * 获取业务类型对应的所有服务车型 * @param type @@ -251,4 +279,155 @@ return data; } + + /** + * 计算价格 + * @param companyId + * @param distance + * @param duration + * @param wait + * @param type + * @return + * @throws Exception + */ + public ServerCarModelWarpper getPrice(Integer serverCarModelId, Integer companyId, double distance, long duration, long wait, Integer type) throws Exception { + Map<String, Object> query1 = systemPriceMapper.query(companyId, type, serverCarModelId); + if(null == query1){//排除没有设置价格的车型 + return null; + } + //开始根据不同的方式计算金额 + double amount = 0; + if(type == 1){//专车 + JSONObject jsonObject = JSON.parseObject(query1.get("content").toString()); + Double num1 = jsonObject.getDouble("num1");//起步价(元) + Double num2 = jsonObject.getDouble("num2");//起步公里(公里) + Double num3 = jsonObject.getDouble("num3");//起步时间(分钟) + Double num4 = jsonObject.getDouble("num4");//里程费(元) + Double num5 = jsonObject.getDouble("num5");//时长费(分钟) + Double num6 = jsonObject.getDouble("num6");//等待费(分钟) + Double num7 = jsonObject.getDouble("num7");//等待费(元) + Double num8 = jsonObject.getDouble("num8");//远途费(公里) + Double num9 = jsonObject.getDouble("num9");//远途费(公里) + Double num10 = jsonObject.getDouble("num10");//远途费(元) + Double num11 = jsonObject.getDouble("num11");//远途费(公里) + Double num12 = jsonObject.getDouble("num12");//远途费(公里) + Double num13 = jsonObject.getDouble("num13");//远途费(元) + Double num14 = jsonObject.getDouble("num14");//远途费(公里) + Double num15 = jsonObject.getDouble("num15");//远途费(元) + String num16 = jsonObject.getString("num16");//夜间费(开始时间) + Double num17 = jsonObject.getDouble("num17");//夜间费(元) + Double num18 = jsonObject.getDouble("num18");//夜间费(元) + Double num19 = jsonObject.getDouble("num19");//夜间费(元) + Double num20 = jsonObject.getDouble("num20");//夜间费(元) + Double num21 = jsonObject.getDouble("num21");//夜间费(元) + Double num22 = jsonObject.getDouble("num22");//夜间费(元) + String num23 = jsonObject.getString("num23");//高峰费(开始时间) + String num24 = jsonObject.getString("num24");//高峰费(开始时间) + Double num25 = jsonObject.getDouble("num25");//高峰费(元) + Double num26 = jsonObject.getDouble("num26");//高峰费(元) + Double num27 = jsonObject.getDouble("num27");//高峰费(元) + Double num28 = jsonObject.getDouble("num28");//高峰费(元) + Double num29 = jsonObject.getDouble("num29");//高峰费(元) + Double num30 = jsonObject.getDouble("num30");//高峰费(元) + + Date date = new Date(); + double d = distance / 1000;//实际公里 + double t = duration / 60;//实际时间 + + double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里 + double t1 = (t - num3) < 0 ? 0 : t - num3;//超过起步分钟数的时间 + double yt1 = 0;//远途1段 + double yt2 = 0;//远途2段 + double yt3 = 0;//远途3段 + + + //夜间服务处理逻辑 + Calendar s = Calendar.getInstance(); + s.setTime(date); + s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0])); + s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1])); + + Calendar e = Calendar.getInstance(); + e.setTime(date); + e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0])); + e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1])); + + if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){ + if(d > num8.doubleValue()){ + yt1 = num20 * (num9 - num8); + } + if(d > num11.doubleValue()){ + yt2 = num21 * (num12 - num11); + } + if(d > num14.doubleValue()){ + yt3 = num22 * (d - num14); + } + amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3; + ServerCarModelWarpper serverCarModelWarpper = new ServerCarModelWarpper(); + serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue()); + serverCarModelWarpper.setMileage(d); + serverCarModelWarpper.setDuration(t); + return serverCarModelWarpper; + } + + + //高峰时段处理逻辑 + Calendar s1 = Calendar.getInstance(); + s1.setTime(date); + s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[0].split(":")[0])); + s1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[0].split(":")[1])); + + Calendar e1 = Calendar.getInstance(); + e1.setTime(date); + e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[1].split(":")[0])); + e1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[1].split(":")[1])); + + Calendar s2 = Calendar.getInstance(); + s2.setTime(date); + s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[0].split(":")[0])); + s2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[0].split(":")[1])); + + Calendar e2 = Calendar.getInstance(); + e2.setTime(date); + e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[1].split(":")[0])); + e2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[1].split(":")[1])); + + if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){ + if(d > num8.doubleValue()){ + yt1 = num28 * (num9 - num8); + } + if(d > num11.doubleValue()){ + yt2 = num29 * (num12 - num11); + } + if(d > num14.doubleValue()){ + yt3 = num30 * (d - num14); + } + amount = num25 + (d1 * num26) + (t1 * num27) + (wait * num7) + yt1 + yt2 + yt3; + ServerCarModelWarpper serverCarModelWarpper = new ServerCarModelWarpper(); + serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue()); + serverCarModelWarpper.setMileage(d); + serverCarModelWarpper.setDuration(t); + return serverCarModelWarpper; + } + + //其他时间段的计算 + if(d > num8.doubleValue()){ + yt1 = num10 * (num9 - num8); + } + if(d > num11.doubleValue()){ + yt2 = num13 * (num12 - num11); + } + if(d > num14.doubleValue()){ + yt3 = num15 * (d - num14); + } + amount = num1 + (d1 * num4) + (t1 * num5) + (wait * num7) + yt1 + yt2 + yt3; + ServerCarModelWarpper serverCarModelWarpper = new ServerCarModelWarpper(); + serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue()); + serverCarModelWarpper.setMileage(d); + serverCarModelWarpper.setDuration(t); + return serverCarModelWarpper; + } + return null; + } + } diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GeodesyUtil.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GeodesyUtil.java new file mode 100644 index 0000000..8611192 --- /dev/null +++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GeodesyUtil.java @@ -0,0 +1,75 @@ +package com.stylefeng.guns.modular.system.util; + +import com.stylefeng.guns.core.util.ToolUtil; +import org.gavaghan.geodesy.Ellipsoid; +import org.gavaghan.geodesy.GeodeticCalculator; +import org.gavaghan.geodesy.GeodeticCurve; +import org.gavaghan.geodesy.GlobalCoordinates; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +/** + * 计算两个金纬度坐标之间的直线距离 + */ +@Component +public class GeodesyUtil { + + + /** + * 获取直线距离 + * @param fromLonLat + * @param toLonLat + * @return + */ + public Map<String, Double> getDistance(String fromLonLat, String toLonLat){ + Map<String, Double> map = null; + if(ToolUtil.isNotEmpty(fromLonLat) && ToolUtil.isNotEmpty(toLonLat)){ + map = new HashMap<>(); + String[] from = fromLonLat.split(","); + String[] to = toLonLat.split(","); + GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(from[1]), Double.valueOf(from[0])); + GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(to[1]), Double.valueOf(to[0])); + double Sphere = getDistanceMeter(source, target, Ellipsoid.Sphere); + double WGS84 = getDistanceMeter(source, target, Ellipsoid.WGS84); + double GRS80 = getDistanceMeter(source, target, Ellipsoid.GRS80); + double GRS67 = getDistanceMeter(source, target, Ellipsoid.GRS67); + double ANS = getDistanceMeter(source, target, Ellipsoid.ANS); + double WGS72 = getDistanceMeter(source, target, Ellipsoid.WGS72); + double Clarke1858 = getDistanceMeter(source, target, Ellipsoid.Clarke1858); + double Clarke1880 = getDistanceMeter(source, target, Ellipsoid.Clarke1880); +// System.out.println("Sphere坐标系计算结果:"+Sphere + "米"); +// System.out.println("WGS84坐标系计算结果:"+WGS84 + "米"); +// System.out.println("GRS80坐标系计算结果:"+GRS80 + "米"); +// System.out.println("GRS67坐标系计算结果:"+GRS67 + "米"); +// System.out.println("ANS坐标系计算结果:"+ANS + "米"); +// System.out.println("WGS72坐标系计算结果:"+WGS72 + "米"); +// System.out.println("Clarke1858坐标系计算结果:"+Clarke1858 + "米"); +// System.out.println("Clarke1880坐标系计算结果:"+Clarke1880 + "米"); + map.put("Sphere", Sphere); + map.put("WGS84", WGS84); + map.put("GRS80", GRS80); + map.put("GRS67", GRS67); + map.put("ANS", ANS); + map.put("WGS72", WGS72); + map.put("Clarke1858", Clarke1858); + map.put("Clarke1880", Clarke1880); + } + return map; + } + + + private double getDistanceMeter(GlobalCoordinates gpsFrom, GlobalCoordinates gpsTo, Ellipsoid ellipsoid){ + //创建GeodeticCalculator,调用计算方法,传入坐标系、经纬度用于计算距离 + GeodeticCurve geoCurve = new GeodeticCalculator().calculateGeodeticCurve(ellipsoid, gpsFrom, gpsTo); + return geoCurve.getEllipsoidalDistance(); + } + + + + public static void main(String[] ages){ + GeodesyUtil geodesyUtil = new GeodesyUtil(); + geodesyUtil.getDistance("115.481028,39.989643", "114.465302,40.004717"); + } +} -- Gitblit v1.7.1