feat(admin): 添加骑手看板数据查询功能

- 新增 AdminRiderDashboardVO 数据传输对象 - 实现 listDashboardByCity 方法查询商铺内骑手看板数据 - 添加骑手状态构建和负载率计算逻辑 - 更新控制器添加 /dashboard 接口 - 修正城市相关术语为商铺并更新相关注释 - 添加调试日志记录和业务验证逻辑

feat(admin): 添加骑手看板数据查询功能
- 新增 AdminRiderDashboardVO 数据传输对象 - 实现 listDashboardByCity 方法查询商铺内骑手看板数据 - 添加骑手状态构建和负载率计算逻辑 - 更新控制器添加 /dashboard 接口 - 修正城市相关术语为商铺并更新相关注释 - 添加调试日志记录和业务验证逻辑
蒋勇
1 parent 1a1b19a7
Showing 5 changed files with 178 additions and 6 deletions
src/main/java/com/diligrp/rider/controller/AdminLocationController.java
src/main/java/com/diligrp/rider/controller/RiderLocationController.java
src/main/java/com/diligrp/rider/service/RiderLocationService.java
src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java
src/main/java/com/diligrp/rider/vo/AdminRiderDashboardVO.java
@@ -3,9 +3,11 @@ package com.diligrp.rider.controller;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.common.result.Result;
 import com.diligrp.rider.service.RiderLocationService;
+import com.diligrp.rider.vo.AdminRiderDashboardVO;
 import com.diligrp.rider.vo.AdminRiderLocationVO;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,10 +18,14 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/admin/location")
 @RequiredArgsConstructor
+@Slf4j
 public class AdminLocationController {
     private final RiderLocationService riderLocationService;
+    /**
+     * 查询商铺内最近活跃的骑手位置列表，供后台地图初始化使用。
+     */
     @GetMapping("/active")
     public Result<List<AdminRiderLocationVO>> active(@RequestParam(required = false) Long cityId,
                                                      HttpServletRequest request) {
@@ -27,9 +33,29 @@ public class AdminLocationController {
         Long resolvedCityId = "substation".equals(role)
                 ? (Long) request.getAttribute("cityId")
                 : cityId;
+        log.debug("查询商铺活跃骑手位置列表，请求参数 role={} cityId={} resolvedCityId={}",
+                role, cityId, resolvedCityId);
         if (resolvedCityId == null || resolvedCityId < 1) {
-            throw new BizException(400, "请选择城市");
+            throw new BizException(400, "请选择商铺");
         }
         return Result.success(riderLocationService.listActiveByCity(resolvedCityId));
     }
+
+    /**
+     * 查询商铺内骑手看板数据。
+     */
+    @GetMapping("/dashboard")
+    public Result<List<AdminRiderDashboardVO>> dashboard(@RequestParam(required = false) Long cityId,
+                                                         HttpServletRequest request) {
+        String role = (String) request.getAttribute("role");
+        Long resolvedCityId = "substation".equals(role)
+                ? (Long) request.getAttribute("cityId")
+                : cityId;
+        log.debug("查询商铺骑手看板数据，请求参数 role={} cityId={} resolvedCityId={}",
+                role, cityId, resolvedCityId);
+        if (resolvedCityId == null || resolvedCityId < 1) {
+            throw new BizException(400, "请选择商铺");
+        }
+        return Result.success(riderLocationService.listDashboardByCity(resolvedCityId));
+    }
 }
@@ -53,7 +53,7 @@ public class RiderLocationController {
     }
     /**
-     * 查询当前登录骑手所属城市内的附近骑手。
+     * 查询当前登录骑手所属商铺内的附近骑手。
      */
     @GetMapping("/nearby")
     public Result<List<NearbyRiderVO>> nearby(
 package com.diligrp.rider.service;
 import com.diligrp.rider.dto.LocationDTO;
+import com.diligrp.rider.vo.AdminRiderDashboardVO;
 import com.diligrp.rider.vo.AdminRiderLocationVO;
 import com.diligrp.rider.vo.NearbyRiderVO;
@@ -14,12 +15,16 @@ public interface RiderLocationService {
     /** 获取骑手位置 */
     LocationDTO getLocation(Long riderId);
+    /** 查询商铺内最近活跃的骑手位置列表 */
     List<AdminRiderLocationVO> listActiveByCity(Long cityId);
+    /** 查询商铺内骑手看板数据 */
+    List<AdminRiderDashboardVO> listDashboardByCity(Long cityId);
+
     /**
      * 获取附近在线骑手列表
      *
-     * @param cityId 城市ID
+     * @param cityId 商铺ID
      * @param lng    查询点经度
      * @param lat    查询点纬度
      */
@@ -3,13 +3,16 @@ package com.diligrp.rider.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.diligrp.rider.dto.DeliveryPricingConfigDTO;
 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.RiderLocationMapper;
 import com.diligrp.rider.mapper.RiderMapper;
+import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.service.CityService;
 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.NearbyRiderVO;
 import com.diligrp.rider.websocket.LocationPushService;
@@ -30,6 +33,7 @@ public class RiderLocationServiceImpl implements RiderLocationService {
     private final RiderLocationMapper locationMapper;
     private final RiderMapper riderMapper;
+    private final OrdersMapper ordersMapper;
     private final CityService cityService;
     private final LocationPushService locationPushService;
@@ -77,6 +81,9 @@ public class RiderLocationServiceImpl implements RiderLocationService {
         return dto;
     }
+    /**
+     * 查询指定商铺最近活跃的骑手位置列表。
+     */
     @Override
     public List<AdminRiderLocationVO> listActiveByCity(Long cityId) {
         List<AdminRiderLocationVO> result = new ArrayList<>();
@@ -121,12 +128,84 @@ public class RiderLocationServiceImpl implements RiderLocationService {
             } catch (Exception ignored) {
             }
         }
-        log.debug("查询城市活跃骑手位置完成，cityId={} count={}", cityId, result.size());
+        log.debug("查询商铺活跃骑手位置完成，cityId={} count={}", cityId, result.size());
         return result;
     }
     /**
-     * 查询城市范围内最近活跃的附近骑手。
+     * 查询指定商铺骑手看板数据。
+     */
+    @Override
+    public List<AdminRiderDashboardVO> listDashboardByCity(Long cityId) {
+        List<AdminRiderDashboardVO> result = new ArrayList<>();
+        log.debug("开始查询商铺骑手看板，参数 cityId={}", cityId);
+        if (cityId == null || cityId < 1) {
+            return result;
+        }
+
+        List<Rider> riders = riderMapper.selectList(new LambdaQueryWrapper<Rider>()
+                .eq(Rider::getCityId, cityId)
+                .orderByDesc(Rider::getId));
+        if (riders.isEmpty()) {
+            log.debug("商铺下没有骑手，cityId={}", cityId);
+            return result;
+        }
+
+        List<Long> riderIds = riders.stream().map(Rider::getId).toList();
+        List<RiderLocation> locations = locationMapper.selectList(
+                new LambdaQueryWrapper<RiderLocation>().in(RiderLocation::getUid, riderIds));
+        List<Orders> holdingOrders = ordersMapper.selectList(new LambdaQueryWrapper<Orders>()
+                .eq(Orders::getCityId, cityId)
+                .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());
+
+        java.util.Map<Long, RiderLocation> locationMap = new java.util.HashMap<>();
+        for (RiderLocation location : locations) {
+            RiderLocation current = locationMap.get(location.getUid());
+            if (current == null || (current.getUpdateTime() != null
+                    && location.getUpdateTime() != null
+                    && location.getUpdateTime() > current.getUpdateTime())) {
+                locationMap.put(location.getUid(), location);
+            }
+        }
+
+        java.util.Map<Long, Integer> holdCountMap = new java.util.HashMap<>();
+        for (Orders order : holdingOrders) {
+            holdCountMap.merge(order.getRiderId(), 1, Integer::sum);
+        }
+
+        for (Rider rider : riders) {
+            AdminRiderDashboardVO vo = new AdminRiderDashboardVO();
+            vo.setRiderId(rider.getId());
+            vo.setRiderName(rider.getUserNickname());
+            vo.setMobile(rider.getMobile());
+            vo.setStatus(buildRiderStatus(rider, locationMap.get(rider.getId())));
+
+            int holdOrderCount = holdCountMap.getOrDefault(rider.getId(), 0);
+            vo.setHoldOrderCount(holdOrderCount);
+            vo.setLoadRate(calcLoadRate(rider, holdOrderCount));
+
+            RiderLocation location = locationMap.get(rider.getId());
+            if (location != null) {
+                vo.setLastLocationTime(location.getUpdateTime());
+                try {
+                    vo.setLng(new BigDecimal(location.getLng()));
+                    vo.setLat(new BigDecimal(location.getLat()));
+                } catch (Exception ignored) {
+                }
+            }
+            result.add(vo);
+        }
+
+        log.debug("查询骑手看板完成，cityId={} count={}", cityId, result.size());
+        return result;
+    }
+
+    /**
+     * 查询商铺范围内最近活跃的附近骑手。
      */
     @Override
     public List<NearbyRiderVO> getNearby(Long cityId, BigDecimal lng, BigDecimal lat) {
@@ -150,7 +229,7 @@ public class RiderLocationServiceImpl implements RiderLocationService {
                 .eq(Rider::getIsRest, 0)
                 .eq(Rider::getUserStatus, 1));
         if (riders.isEmpty()) {
-            log.debug("当前城市没有在线骑手，cityId={}", cityId);
+            log.debug("当前商铺没有在线骑手，cityId={}", cityId);
             return result;
         }
@@ -185,4 +264,31 @@ public class RiderLocationServiceImpl implements RiderLocationService {
                 cityId, riders.size(), locations.size(), result.size());
         return result;
     }
+
+    private String buildRiderStatus(Rider rider, RiderLocation location) {
+        if (rider.getUserStatus() == null || rider.getUserStatus() != 1) {
+            return "审核中";
+        }
+        if (rider.getStatus() == null || rider.getStatus() != 1) {
+            return "已禁用";
+        }
+        if (rider.getIsRest() != null && rider.getIsRest() == 1) {
+            return "休息中";
+        }
+        long now = System.currentTimeMillis() / 1000;
+        if (location == null || location.getUpdateTime() == null
+                || now - location.getUpdateTime() > ACTIVE_WINDOW_SECONDS) {
+            return "离线";
+        }
+        return "在线";
+    }
+
+    private int calcLoadRate(Rider rider, int holdOrderCount) {
+        int maxHoldCount = rider.getType() != null && rider.getType() == 2 ? 4 : 2;
+        if (maxHoldCount <= 0) {
+            return 0;
+        }
+        int rate = holdOrderCount * 100 / maxHoldCount;
+        return Math.min(rate, 100);
+    }
 }
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AdminRiderDashboardVO {
+    /** 骑手ID */
+    private Long riderId;
+
+    /** 骑手名称 */
+    private String riderName;
+
+    /** 手机号 */
+    private String mobile;
+
+    /** 当前状态 */
+    private String status;
+
+    /** 当前持单量 */
+    private Integer holdOrderCount;
+
+    /** 当前负载率，单位百分比 */
+    private Integer loadRate;
+
+    /** 最后定位时间，时间戳秒 */
+    private Long lastLocationTime;
+
+    /** 最后定位经度 */
+    private BigDecimal lng;
+
+    /** 最后定位纬度 */
+    private BigDecimal lat;
+}