新增点位判断

liujie

2026-03-14 f2936227a40793ee06ff465fec46cb6da2f9f186

新增点位判断

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java

@@ -83,6 +83,12 @@
            XpSystemSetting xpSystemSetting = xpSystemSettingMapper.selectOne(null);
            orderDistance = xpSystemSetting.getNearPointDistance();
        }


        List<XpPoint> list1 = list(new LambdaQueryWrapper<XpPoint>().eq(XpPoint::getOperationStatus, 2).eq(XpPoint::getPointType,1).isNotNull(XpPoint::getElectronicAreaId));
        if(list1.size()<2){
            return new NearestVo();
        }
        // 获取所有的站点信息
        List<XpPoint> list = list(new LambdaQueryWrapper<XpPoint>().eq(XpPoint::getOperationStatus, 2).eq(XpPoint::getPointType,1).isNotNull(XpPoint::getElectronicAreaId)
                // 添加距离计算字段

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/vo/NearestVo.java

@@ -3,14 +3,15 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

@Data
@ApiModel(value = "NearestNextVo对象", description = "附近站点vo")
public class NearestVo {

    private List<NearestNextVo> points;
    private List<NearestNextVo> points=new ArrayList<>();


    private Integer total;
    private Integer total=0;
}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/mapper/XpOrderMapper.java

@@ -64,10 +64,10 @@
     */
    List<XpOrderHistoryListVO> getHistoryOrderList(@Param("page") Page<XpOrderHistoryListVO> page, @Param("query") XpHistoryOrderListQuery query, @Param("uid") Long uid);

    List<XpOrder> getHistoryStartPoints(@Param("uid") Long uid);
    List<XpOrder> getHistoryStartPoints(@Param("uid") Long uid, @Param("areaId") Long areaId);


    List<XpOrder> getHistoryEndPoints(@Param("uid") Long uid);
    List<XpOrder> getHistoryEndPoints(@Param("uid") Long uid, @Param("areaId") Long areaId);


}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -1022,7 +1022,7 @@
    @Override
    public List<XpHistoryStartPointsVo> getHistoryStartPoints(String uid, double lon, double lat,Long electronicAreaId) {
        //
        List<XpOrder> xpOrders = this.baseMapper.getHistoryStartPoints(Long.valueOf(uid));
        List<XpOrder> xpOrders = this.baseMapper.getHistoryStartPoints(Long.valueOf(uid),electronicAreaId);
//        selectList(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.parseLong(uid)).orderByDesc(BaseModel::getCreateTime).last("LIMIT 10"));
        if (xpOrders.isEmpty()) {
            return Collections.emptyList();
@@ -1060,7 +1060,7 @@
    @Override
    public List<XpHistoryEndPointsVo> getHistoryEndPoints(String uid, double lon, double lat,Long electronicAreaId) {
        //
        List<XpOrder> xpOrders = this.baseMapper.getHistoryEndPoints(Long.valueOf(uid));
        List<XpOrder> xpOrders = this.baseMapper.getHistoryEndPoints(Long.valueOf(uid), electronicAreaId);
//        selectList(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.parseLong(uid)).orderByDesc(BaseModel::getCreateTime).last("LIMIT 10"));
        if (xpOrders.isEmpty()) {
            return Collections.emptyList();

 xp-robotaxi-order-boot/src/main/resources/mapper/order/XpOrderMapper.xml

@@ -58,7 +58,7 @@
        SELECT
            start_point_id,
            COUNT(*) AS num
        FROM xp_order where app_user_id = #{uid}
        FROM xp_order where app_user_id = #{uid} and xp_electronic_fence_area_id =#{areaId}
        GROUP BY start_point_id
        ORDER BY num DESC,create_time desc
    </select>
@@ -67,7 +67,7 @@
        SELECT
            end_point_id,
            COUNT(*) AS num
        FROM xp_order where app_user_id = #{uid}
        FROM xp_order where app_user_id = #{uid} and xp_electronic_fence_area_id =#{areaId}
        GROUP BY end_point_id
        ORDER BY num DESC,create_time desc
    </select>