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(); } }