feat(rider): 更新骑手看板负载率计算逻辑

- 添加规则配置的最大接单量字段到AdminRiderDashboardVO - 引入DispatchRuleService和DispatchRuleTemplateVO依赖 - 实现基于规则配置的最大接单量计算负载率功能 - 修改负载率计算方法参数结构 - 更新调试日志输出格式增加最大接单量信息 - 调整骑手看板数据查询逻辑以支持新的负载率计算方式

feat(rider): 更新骑手看板负载率计算逻辑
- 添加规则配置的最大接单量字段到AdminRiderDashboardVO - 引入DispatchRuleService和DispatchRuleTemplateVO依赖 - 实现基于规则配置的最大接单量计算负载率功能 - 修改负载率计算方法参数结构 - 更新调试日志输出格式增加最大接单量信息 - 调整骑手看板数据查询逻辑以支持新的负载率计算方式
蒋勇
1 parent a9f9dcb3
Showing 2 changed files with 26 additions and 10 deletions
src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java
src/main/java/com/diligrp/rider/vo/AdminRiderDashboardVO.java
@@ -6,14 +6,16 @@ import com.diligrp.rider.dto.LocationDTO;
 import com.diligrp.rider.entity.Orders;
 import com.diligrp.rider.entity.Rider;
 import com.diligrp.rider.entity.RiderLocation;
+import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.mapper.RiderLocationMapper;
 import com.diligrp.rider.mapper.RiderMapper;
-import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.service.CityService;
+import com.diligrp.rider.service.DispatchRuleService;
 import com.diligrp.rider.service.RiderLocationService;
 import com.diligrp.rider.util.GeoUtil;
 import com.diligrp.rider.vo.AdminRiderDashboardVO;
 import com.diligrp.rider.vo.AdminRiderLocationVO;
+import com.diligrp.rider.vo.DispatchRuleTemplateVO;
 import com.diligrp.rider.vo.NearbyRiderVO;
 import com.diligrp.rider.websocket.LocationPushService;
 import lombok.RequiredArgsConstructor;
@@ -35,6 +37,7 @@ public class RiderLocationServiceImpl implements RiderLocationService {
     private final RiderMapper riderMapper;
     private final OrdersMapper ordersMapper;
     private final CityService cityService;
+    private final DispatchRuleService dispatchRuleService;
     private final LocationPushService locationPushService;
  
     /**
@@ -143,6 +146,9 @@ public class RiderLocationServiceImpl implements RiderLocationService {
             return result;
         }
  
+        DispatchRuleTemplateVO rule = dispatchRuleService.getActiveRule(cityId);
+        Integer maxHoldOrderCount = normalizeMaxHoldOrderCount(rule);
+
         List<Rider> riders = riderMapper.selectList(new LambdaQueryWrapper<Rider>()
                 .eq(Rider::getCityId, cityId)
                 .orderByDesc(Rider::getId));
@@ -159,8 +165,8 @@ public class RiderLocationServiceImpl implements RiderLocationService {
                 .in(Orders::getStatus, List.of(3, 4))
                 .in(Orders::getRiderId, riderIds)
                 .eq(Orders::getIsDel, 0));
-        log.debug("商铺骑手看板基础数据查询完成，cityId={} riderCount={} locationCount={} holdingOrderCount={}",
-                cityId, riders.size(), locations.size(), holdingOrders.size());
+        log.debug("商铺骑手看板基础数据查询完成，cityId={} riderCount={} locationCount={} holdingOrderCount={} maxHoldOrderCount={}",
+                cityId, riders.size(), locations.size(), holdingOrders.size(), maxHoldOrderCount);
  
         java.util.Map<Long, RiderLocation> locationMap = new java.util.HashMap<>();
         for (RiderLocation location : locations) {
@@ -186,7 +192,8 @@ public class RiderLocationServiceImpl implements RiderLocationService {
  
             int holdOrderCount = holdCountMap.getOrDefault(rider.getId(), 0);
             vo.setHoldOrderCount(holdOrderCount);
-            vo.setLoadRate(calcLoadRate(rider, holdOrderCount));
+            vo.setMaxHoldOrderCount(maxHoldOrderCount);
+            vo.setLoadRate(calcLoadRate(holdOrderCount, maxHoldOrderCount));
  
             RiderLocation location = locationMap.get(rider.getId());
             if (location != null) {
@@ -283,12 +290,18 @@ public class RiderLocationServiceImpl implements RiderLocationService {
         return "在线";
     }
  
-    private int calcLoadRate(Rider rider, int holdOrderCount) {
-        int maxHoldCount = rider.getType() != null && rider.getType() == 2 ? 4 : 2;
-        if (maxHoldCount <= 0) {
-            return 0;
+    private Integer normalizeMaxHoldOrderCount(DispatchRuleTemplateVO rule) {
+        if (rule == null || rule.getGrabMaxPerRider() == null || rule.getGrabMaxPerRider() <= 0) {
+            return null;
+        }
+        return rule.getGrabMaxPerRider();
+    }
+
+    private Integer calcLoadRate(int holdOrderCount, Integer maxHoldOrderCount) {
+        if (maxHoldOrderCount == null || maxHoldOrderCount <= 0) {
+            return null;
         }
-        int rate = holdOrderCount * 100 / maxHoldCount;
+        int rate = holdOrderCount * 100 / maxHoldOrderCount;
         return Math.min(rate, 100);
     }
 }
@@ -21,7 +21,10 @@ public class AdminRiderDashboardVO {
     /** 当前持单量 */
     private Integer holdOrderCount;
  
-    /** 当前负载率，单位百分比 */
+    /** 规则配置的最大接单量 */
+    private Integer maxHoldOrderCount;
+
+    /** 当前负载率，按持单量/规则最大接单量计算，单位百分比 */
     private Integer loadRate;
  
     /** 最后定位时间，时间戳秒 */