feat(rider): 骑手位置管理功能优化

- 将经纬度数据类型从String改为BigDecimal，并添加数值范围验证 - 实现骑手位置上报的upsert操作，避免重复插入 - 添加详细的日志记录用于调试和监控 - 优化附近骑手查询逻辑，增加活跃时间窗口限制 - 统一坐标系精度处理，提升定位准确性

feat(rider): 骑手位置管理功能优化
- 将经纬度数据类型从String改为BigDecimal，并添加数值范围验证 - 实现骑手位置上报的upsert操作，避免重复插入 - 添加详细的日志记录用于调试和监控 - 优化附近骑手查询逻辑，增加活跃时间窗口限制 - 统一坐标系精度处理，提升定位准确性
蒋勇
1 parent a5543e29
Showing 6 changed files with 121 additions and 45 deletions
src/main/java/com/diligrp/rider/controller/RiderLocationController.java
src/main/java/com/diligrp/rider/dto/LocationDTO.java
src/main/java/com/diligrp/rider/mapper/RiderLocationMapper.java
src/main/java/com/diligrp/rider/service/RiderLocationService.java
src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java
src/main/resources/mapper/RiderLocationMapper.xml
@@ -6,43 +6,68 @@ import com.diligrp.rider.service.RiderLocationService;
 import com.diligrp.rider.vo.NearbyRiderVO;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
  
+import java.math.BigDecimal;
 import java.util.List;
  
 @RestController
 @RequestMapping("/api/rider/location")
 @RequiredArgsConstructor
+@Validated
+@Slf4j
 public class RiderLocationController {
  
     private final RiderLocationService locationService;
  
-    /** 上报位置 */
+    /**
+     * 上报骑手当前位置。
+     */
     @PostMapping("/update")
     public Result<Void> update(@Valid @RequestBody LocationDTO dto, HttpServletRequest request) {
         Long riderId = (Long) request.getAttribute("riderId");
+        log.debug("骑手位置上报，请求参数 riderId={} lng={} lat={}",
+                riderId, dto.getLng(), dto.getLat());
         locationService.updateLocation(riderId, dto);
         return Result.success();
     }
  
-    /** 查看自己位置 */
+    /**
+     * 回显当前登录骑手的位置。
+     */
     @GetMapping
     public Result<LocationDTO> get(HttpServletRequest request) {
         Long riderId = (Long) request.getAttribute("riderId");
+        log.debug("查询骑手位置，请求参数 riderId={}", riderId);
         return Result.success(locationService.getLocation(riderId));
     }
  
     /**
-     * 附近在线骑手列表（分站地图查看用）
-     *  Location.getNearby()
+     * 查询当前登录骑手所属城市内的附近骑手。
      */
     @GetMapping("/nearby")
     public Result<List<NearbyRiderVO>> nearby(
-            @RequestParam Long cityId,
-            @RequestParam String lng,
-            @RequestParam String lat,
+            @RequestParam
+            @DecimalMin(value = "-180.0", message = "经度超出范围")
+            @DecimalMax(value = "180.0", message = "经度超出范围")
+            BigDecimal lng,
+            @RequestParam
+            @DecimalMin(value = "-90.0", message = "纬度超出范围")
+            @DecimalMax(value = "90.0", message = "纬度超出范围")
+            BigDecimal lat,
             HttpServletRequest request) {
+        Long cityId = (Long) request.getAttribute("cityId");
+        log.debug("查询附近骑手，请求参数 cityId={} lng={} lat={}", cityId, lng, lat);
         return Result.success(locationService.getNearby(cityId, lng, lat));
     }
 }
 package com.diligrp.rider.dto;
  
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
  
+import java.math.BigDecimal;
+
 @Data
 public class LocationDTO {
     @NotNull(message = "经度不能为空")
-    private String lng;
+    @DecimalMin(value = "-180.0", message = "经度超出范围")
+    @DecimalMax(value = "180.0", message = "经度超出范围")
+    private BigDecimal lng;
+
     @NotNull(message = "纬度不能为空")
-    private String lat;
+    @DecimalMin(value = "-90.0", message = "纬度超出范围")
+    @DecimalMax(value = "90.0", message = "纬度超出范围")
+    private BigDecimal lat;
 }
@@ -3,7 +3,15 @@ package com.diligrp.rider.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diligrp.rider.entity.RiderLocation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
  
 @Mapper
 public interface RiderLocationMapper extends BaseMapper<RiderLocation> {
+    /**
+     * 按骑手ID写入位置，若记录已存在则更新经纬度和更新时间。
+     */
+    int upsertLocation(@Param("uid") Long uid,
+                       @Param("lng") String lng,
+                       @Param("lat") String lat,
+                       @Param("updateTime") Long updateTime);
 }
@@ -3,19 +3,22 @@ package com.diligrp.rider.service;
 import com.diligrp.rider.dto.LocationDTO;
 import com.diligrp.rider.vo.NearbyRiderVO;
  
+import java.math.BigDecimal;
 import java.util.List;
  
 public interface RiderLocationService {
     /** 上报骑手位置 */
     void updateLocation(Long riderId, LocationDTO dto);
+
     /** 获取骑手位置 */
     LocationDTO getLocation(Long riderId);
+
     /**
      * 获取附近在线骑手列表
-     *  Location.getNearby()
+     *
      * @param cityId 城市ID
      * @param lng    查询点经度
      * @param lat    查询点纬度
      */
-    List<NearbyRiderVO> getNearby(Long cityId, String lng, String lat);
+    List<NearbyRiderVO> getNearby(Long cityId, BigDecimal lng, BigDecimal lat);
 }
 package com.diligrp.rider.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.diligrp.rider.dto.DeliveryPricingConfigDTO;
 import com.diligrp.rider.dto.LocationDTO;
 import com.diligrp.rider.entity.Rider;
@@ -13,6 +12,7 @@ import com.diligrp.rider.service.RiderLocationService;
 import com.diligrp.rider.util.GeoUtil;
 import com.diligrp.rider.vo.NearbyRiderVO;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
  
 import java.math.BigDecimal;
@@ -21,72 +21,86 @@ import java.util.List;
  
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class RiderLocationServiceImpl implements RiderLocationService {
  
+    private static final long ACTIVE_WINDOW_SECONDS = 300;
+
     private final RiderLocationMapper locationMapper;
     private final RiderMapper riderMapper;
     private final CityService cityService;
  
+    /**
+     * 按骑手维度更新最新位置。
+     */
     @Override
     public void updateLocation(Long riderId, LocationDTO dto) {
-        RiderLocation existing = locationMapper.selectOne(new LambdaQueryWrapper<RiderLocation>()
-                .eq(RiderLocation::getUid, riderId));
         long now = System.currentTimeMillis() / 1000;
-        if (existing == null) {
-            RiderLocation loc = new RiderLocation();
-            loc.setUid(riderId);
-            loc.setLng(dto.getLng());
-            loc.setLat(dto.getLat());
-            loc.setUpdateTime(now);
-            locationMapper.insert(loc);
-        } else {
-            locationMapper.update(null, new LambdaUpdateWrapper<RiderLocation>()
-                    .eq(RiderLocation::getUid, riderId)
-                    .set(RiderLocation::getLng, dto.getLng())
-                    .set(RiderLocation::getLat, dto.getLat())
-                    .set(RiderLocation::getUpdateTime, now));
-        }
+        log.debug("更新骑手位置，参数 riderId={} lng={} lat={} updateTime={}",
+                riderId, dto.getLng(), dto.getLat(), now);
+        locationMapper.upsertLocation(
+                riderId,
+                dto.getLng().stripTrailingZeros().toPlainString(),
+                dto.getLat().stripTrailingZeros().toPlainString(),
+                now);
     }
  
+    /**
+     * 查询当前骑手最近一次上报的位置。
+     */
     @Override
     public LocationDTO getLocation(Long riderId) {
+        log.debug("查询骑手当前位置，参数 riderId={}", riderId);
         RiderLocation loc = locationMapper.selectOne(new LambdaQueryWrapper<RiderLocation>()
                 .eq(RiderLocation::getUid, riderId));
-        if (loc == null) return null;
+        if (loc == null) {
+            log.debug("未查询到骑手位置，riderId={}", riderId);
+            return null;
+        }
         LocationDTO dto = new LocationDTO();
-        dto.setLng(loc.getLng());
-        dto.setLat(loc.getLat());
+        dto.setLng(new BigDecimal(loc.getLng()));
+        dto.setLat(new BigDecimal(loc.getLat()));
         return dto;
     }
  
+    /**
+     * 查询城市范围内最近活跃的附近骑手。
+     */
     @Override
-    public List<NearbyRiderVO> getNearby(Long cityId, String lng, String lat) {
+    public List<NearbyRiderVO> getNearby(Long cityId, BigDecimal lng, BigDecimal lat) {
         List<NearbyRiderVO> result = new ArrayList<>();
-        if (cityId == null || cityId < 1 || lng == null || lat == null) return result;
+        log.debug("开始查询附近骑手，参数 cityId={} lng={} lat={}", cityId, lng, lat);
+        if (cityId == null || cityId < 1 || lng == null || lat == null) {
+            return result;
+        }
  
-        // 获取城市配置的附近距离范围（km）
         DeliveryPricingConfigDTO config = cityService.getConfig(cityId);
-        if (config == null) return result;
+        if (config == null) {
+            return result;
+        }
         BigDecimal limitKm = config.getRiderDistance();
         if (limitKm == null || limitKm.compareTo(BigDecimal.ZERO) <= 0) {
-            limitKm = BigDecimal.valueOf(3); // 默认3km
+            limitKm = BigDecimal.valueOf(3);
         }
  
-        // 查该城市所有在线（未休息）骑手
         List<Rider> riders = riderMapper.selectList(new LambdaQueryWrapper<Rider>()
                 .eq(Rider::getCityId, cityId)
                 .eq(Rider::getIsRest, 0)
                 .eq(Rider::getUserStatus, 1));
-        if (riders.isEmpty()) return result;
+        if (riders.isEmpty()) {
+            log.debug("当前城市没有在线骑手，cityId={}", cityId);
+            return result;
+        }
  
         List<Long> riderIds = riders.stream().map(Rider::getId).toList();
-
-        // 查骑手位置
+        long minUpdateTime = System.currentTimeMillis() / 1000 - ACTIVE_WINDOW_SECONDS;
         List<RiderLocation> locations = locationMapper.selectList(
-                new LambdaQueryWrapper<RiderLocation>().in(RiderLocation::getUid, riderIds));
+                new LambdaQueryWrapper<RiderLocation>()
+                        .in(RiderLocation::getUid, riderIds)
+                        .ge(RiderLocation::getUpdateTime, minUpdateTime));
  
-        double queryLat = Double.parseDouble(lat);
-        double queryLng = Double.parseDouble(lng);
+        double queryLat = lat.doubleValue();
+        double queryLng = lng.doubleValue();
         double limitD = limitKm.doubleValue();
  
         for (RiderLocation loc : locations) {
@@ -102,8 +116,11 @@ public class RiderLocationServiceImpl implements RiderLocationService {
                     vo.setDistance(dist);
                     result.add(vo);
                 }
-            } catch (Exception ignored) {}
+            } catch (Exception ignored) {
+            }
         }
+        log.debug("附近骑手查询完成，cityId={} 在线骑手数={} 位置记录数={} 命中数={}",
+                cityId, riders.size(), locations.size(), result.size());
         return result;
     }
 }
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diligrp.rider.mapper.RiderLocationMapper">
+
+    <insert id="upsertLocation">
+        INSERT INTO rider_location(uid, lng, lat, update_time)
+        VALUES (#{uid}, #{lng}, #{lat}, #{updateTime})
+        ON DUPLICATE KEY UPDATE
+            lng = VALUES(lng),
+            lat = VALUES(lat),
+            update_time = VALUES(update_time)
+    </insert>
+
+</mapper>