diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java index 8c4d0d7..7acacc6 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java @@ -18,7 +18,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.List; import java.util.Objects; @@ -285,10 +284,9 @@ public class EbikeBikeOrderController { * @param acceptOrder 是否自己接单 * @param orderType 工单类型 * @return 操作结果 - * @throws IOException 异常 */ @GetMapping("bikeList") - public JsonResult> bikeList(@RequestParam("regionId") Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException { + public JsonResult> bikeList(@RequestParam("regionId") Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) { List list = ebikeBikeOrderService.bikeList(regionId,bikeCode,bikeStatus,acceptOrder,orderType); return JsonResult.success(list); } @@ -299,7 +297,7 @@ public class EbikeBikeOrderController { * @return 操作结果 */ @GetMapping("bikeInfo") - public JsonResult bikeInfo(@RequestParam("bikeCode") String bikeCode,Integer orderType) throws IOException { + public JsonResult bikeInfo(@RequestParam("bikeCode") String bikeCode,Integer orderType){ EbikeOrderBikeInfoDto info = ebikeBikeOrderService.bikeInfo(bikeCode,orderType); return JsonResult.success(info); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java index b69929f..d42f5d8 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java @@ -8,7 +8,6 @@ import com.mybatisflex.core.service.IService; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.List; /** @@ -95,14 +94,14 @@ public interface EbikeBikeOrderService extends IService { * @param bikeCode 车辆编号 * @return 详情 */ - EbikeOrderBikeInfoDto bikeInfo(String bikeCode,Integer orderType) throws IOException; + EbikeOrderBikeInfoDto bikeInfo(String bikeCode,Integer orderType) ; /** * 获取车辆列表 * @param regionId 运营区ID * @return 列表 */ - List bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException; + List bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType); /** * 完成调度 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java index b181fac..1c285aa 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java @@ -12,12 +12,9 @@ import com.cdzy.operations.model.dto.*; import com.cdzy.operations.model.entity.*; import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.EbikeBikeOrderService; -import com.cdzy.operations.utils.EmqxApiClient; import com.cdzy.operations.utils.GeoCodingUtil; import com.cdzy.operations.utils.MinioUtil; import com.cdzy.operations.utils.RedisUtil; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; @@ -31,7 +28,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; @@ -485,9 +481,17 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl bikeList(Long regionId, String bikeCode, Integer bikeStatus, Boolean acceptOrder, Integer orderType) throws IOException { + public List bikeList(Long regionId, String bikeCode, Integer bikeStatus, Boolean acceptOrder, Integer orderType) { QueryWrapper queryWrapper = QueryWrapper.create() .select( @@ -550,6 +552,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class); List snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList(); Map objectMap = redisUtil.batchGetEcuWithMap(snList); - ObjectNode clientsOnline = EmqxApiClient.isClientsOnline(snList); + //TODO:优化电量的批量获取 list.forEach(e -> { ResGPSDto resGPSDto = (ResGPSDto) objectMap.get(e.getEcuSn()); if (resGPSDto != null) { e.setSoc(resGPSDto.getSoc()); } - JsonNode jsonNode = clientsOnline.get(e.getEcuSn()); - if (jsonNode != null) { - e.setOnline(Boolean.TRUE); - } else { - e.setOnline(Boolean.FALSE); - } }); return list; }