diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java index 8c94ddcd..19408908 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java @@ -255,7 +255,7 @@ public class EbikeRegionController { } /** - * 获取运营区内车辆。 + * 获取运营区所属车辆及其位置。 */ @GetMapping("getOperationBike") public JsonResult getOperationBike(@RequestParam(value = "regionId") String regionId) { diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java index dbc0b423..ba35dd6f 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java @@ -1,8 +1,10 @@ package com.cdzy.ebikeoperate.service.impl; import cn.dev33.satoken.stp.StpUtil; +import com.alibaba.fastjson2.JSONObject; import com.cdzy.common.model.JsonResult; import com.cdzy.common.model.PageParam; +import com.cdzy.common.model.ResGPSDto; import com.cdzy.ebikeoperate.enums.EbikeRegionInOperation; import com.cdzy.ebikeoperate.enums.RegionLevelType; import com.cdzy.ebikeoperate.mapper.EbikeAdministrationZoneMapper; @@ -198,6 +200,12 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl ecuSns = new ArrayList<>(); +// List objects = redisUtil.multiGet(ecuSns); +// List resGPSDtos = objects.stream().map(object -> { +// return (ResGPSDto) object; +// }).toList(); + List bikeInfos = result.getData(); bikeInfos.forEach(rspBikeInfo -> { RedisPoint redisPoint = map.get(rspBikeInfo.getEcuSn());