diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java index 5d983161..1ee4828d 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/RspBikeInfo.java @@ -17,6 +17,8 @@ public class RspBikeInfo { */ private String reginId; + private Integer soc; + /** * 中控ID */ 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 92fc704d..7b5ca751 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 @@ -1,10 +1,12 @@ package com.cdzy.ebikeoperate.service.impl; import cn.dev33.satoken.stp.StpUtil; +import com.alibaba.fastjson2.JSONObject; import com.cdzy.common.enums.Code; import com.cdzy.common.enums.Message; 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.EbikeRegionType; import com.cdzy.ebikeoperate.enums.ShapeType; @@ -254,6 +256,7 @@ public class EbikeRegionServiceImpl extends ServiceImpl getRspBikeInfos(List points) { + //TODO:优化为点列表+电量,再通过详情接口获取车辆详情 if (points != null && !points.isEmpty()) { List sns = points.stream().map(RedisPoint::getMember).toList(); JsonResult> bike = maintenanceFeignClient.getBikeByEcuSn(new ReqEcuSnDto(sns)); @@ -266,6 +269,9 @@ public class EbikeRegionServiceImpl extends ServiceImpl