diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java index dab09d4f..1a85b9d7 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeRegionServiceImpl.java @@ -254,21 +254,25 @@ public class EbikeRegionServiceImpl extends ServiceImpl getRspBikeInfos(List points) { - List sns = points.stream().map(RedisPoint::getMember).toList(); - JsonResult> bike = maintenanceFeignClient.getBikeByEcuSn(new ReqEcuSnDto(sns)); - if (bike.getCode() != Code.SUCCESS) { - throw new RuntimeException("获取车辆信息失败"); - } - List bikeInfos = bike.getData(); - for (RspBikeInfo rspBikeInfo : bikeInfos) { - points.forEach(redisPoint -> { - if (redisPoint.getMember().equals(rspBikeInfo.getEcuSn())) { - rspBikeInfo.setLongitude(redisPoint.getPoint().getX()); - rspBikeInfo.setLatitude(redisPoint.getPoint().getY()); - } - }); - } - return bikeInfos; + if (points != null && !points.isEmpty()) { + List sns = points.stream().map(RedisPoint::getMember).toList(); + JsonResult> bike = maintenanceFeignClient.getBikeByEcuSn(new ReqEcuSnDto(sns)); + if (bike.getCode() != Code.SUCCESS) { + throw new RuntimeException("获取车辆信息失败"); + } + List bikeInfos = bike.getData(); + for (RspBikeInfo rspBikeInfo : bikeInfos) { + points.forEach(redisPoint -> { + if (redisPoint.getMember().equals(rspBikeInfo.getEcuSn())) { + rspBikeInfo.setLongitude(redisPoint.getPoint().getX()); + rspBikeInfo.setLatitude(redisPoint.getPoint().getY()); + } + }); + } + return bikeInfos; + }else { + return List.of(); + } } private void saveRegion(List points, EbikeRegion region, Integer type) { diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/RolesController.java b/ebike-user/src/main/java/com/cdzy/user/controller/RolesController.java index d88c2fb6..7a4cebd6 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/RolesController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/RolesController.java @@ -7,7 +7,6 @@ import com.cdzy.user.service.RolesService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; -import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*;