From ddf00a82b697b24a6e838d688f2596dd8e2ffdb8 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 15 Apr 2025 10:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/orders/model/dto/res/RspBikeDto.java | 1 + .../cdzy/orders/service/impl/UserOrdersServiceImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java index c9be28e3..0f51797c 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java @@ -13,6 +13,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class RspBikeDto { private String ecuSn; + private Integer soc; private Double longitude; private Double latitude; } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java index 33c689cd..30b947e3 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java @@ -143,7 +143,10 @@ public class UserOrdersServiceImpl extends ServiceImpl bikeList(ReqBikeDto bikeDto) { List nearbyMembers = redisUtil.findNearbyMembers(bikeDto.getLongitude(), bikeDto.getLatitude(), bikeDto.getRadius()==null?3.0:bikeDto.getRadius()); - return nearbyMembers.stream().filter(Objects::nonNull).map(redisPoint -> new RspBikeDto(redisPoint.getMember(), redisPoint.getPoint().getX(), redisPoint.getPoint().getY()) - ).toList(); + return nearbyMembers.stream().filter(Objects::nonNull).map(redisPoint -> { + String jsonString = JSONObject.toJSONString(redisUtil.get(redisPoint.getMember())); + ResGPSDto resGpsDto = JSONObject.parseObject(jsonString, ResGPSDto.class); + return new RspBikeDto(redisPoint.getMember(), resGpsDto.getSoc(),redisPoint.getPoint().getX(), redisPoint.getPoint().getY()); + }).toList(); } }