From 2e9311f6151fa4da6674f438757f6ff6d927ac6d Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Wed, 4 Jun 2025 17:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=88=E4=BB=93=E5=BA=93=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeOperationController.java | 12 +++++------ .../model/dto/request/ReqReginIdDto.java | 20 +++++++++++++++++++ .../service/EbikeBikeInfoService.java | 4 ++-- .../impl/EbikeBikeInfoServiceImpl.java | 7 +++++-- 4 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqReginIdDto.java diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java index ff6abe29..f57c3197 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java @@ -2,6 +2,7 @@ package com.cdzy.ebikemaintenance.controller; import com.cdzy.common.model.JsonResult; import com.cdzy.common.model.PageParam; +import com.cdzy.ebikemaintenance.model.dto.request.ReqReginIdDto; import com.cdzy.ebikemaintenance.model.dto.response.ResEbikeInfoRegionDto; import com.cdzy.ebikemaintenance.model.pojo.EbikeBikeInfo; import com.cdzy.ebikemaintenance.service.EbikeBikeInfoService; @@ -10,10 +11,7 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -58,9 +56,9 @@ public class EbikeOperationController { * 根据运营区id获取运营车辆状态及其位置信息列表 * @return 运营车辆列表 */ - @GetMapping("list") - public JsonResult list(@RequestParam("operationRegionId")Long operationRegionId) { - List list = bikeInfoService.getOperationalBikeListWithGpsByRegionId(operationRegionId); + @PostMapping("list") + public JsonResult list(@RequestBody ReqReginIdDto dto) { + List list = bikeInfoService.getOperationalBikeListWithGpsByRegionId(dto.getOperationRegionIds()); return JsonResult.success(list); } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqReginIdDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqReginIdDto.java new file mode 100644 index 00000000..6243752d --- /dev/null +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqReginIdDto.java @@ -0,0 +1,20 @@ +package com.cdzy.ebikemaintenance.model.dto.request; + +import com.cdzy.ebikemaintenance.model.pojo.EbikeBatteryInfo; +import com.cdzy.ebikemaintenance.model.pojo.EbikeEcuInfo; +import com.cdzy.ebikemaintenance.model.pojo.EbikeHelmetInfo; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +@Data +public class ReqReginIdDto { + + + /** + * 运营区id列表 + */ + private List operationRegionIds; +} diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java index 883f914b..6959515e 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java @@ -315,8 +315,8 @@ public interface EbikeBikeInfoService extends IService { /** * 根据运营区id获取运营车辆状态及其位置信息列表 - * @param operationRegionId 运营区id + * @param operationRegionIds 运营区id * @return 列表 */ - List getOperationalBikeListWithGpsByRegionId(Long operationRegionId); + List getOperationalBikeListWithGpsByRegionId(List operationRegionIds); } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index 531dc91a..2f06a2de 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -1538,13 +1538,16 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl getOperationalBikeListWithGpsByRegionId(Long operationRegionId) { + public List getOperationalBikeListWithGpsByRegionId(List operationRegionIds) { + if (operationRegionIds == null || operationRegionIds.isEmpty()) { + return List.of(); + } QueryWrapper query = QueryWrapper.create() .select(EBIKE_BIKE_INFO.ALL_COLUMNS,EBIKE_ECU_INFO.ECU_SN) .leftJoin(EBIKE_ECU_INFO).on(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID)) .where(EBIKE_BIKE_INFO.STATE.in(new String[]{"2", "3", "4"})) .where(EBIKE_BIKE_INFO.IS_IN_WAREHOUSE.eq("0")) - .where(EBIKE_BIKE_INFO.REGIN_ID.eq(String.valueOf(operationRegionId))); + .where(EBIKE_BIKE_INFO.REGIN_ID.in(operationRegionIds)); List list = ebikeBikeInfoMapper.selectListByQueryAs(query, ResEbikeInfoRegionDto.class); if (list == null || list.isEmpty()) { return list;