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 f50768b..bb41861 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 @@ -45,7 +45,7 @@ public class EbikeBikeOrderController { QueryWrapper queryWrapper = QueryWrapper.create() .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(BikeOrderHandleState.UNPROCESSED)) .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType))) - .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode))); + .where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode))); Page orderPage = ebikeBikeOrderService.page(page.getPage(), queryWrapper); return JsonResult.success(orderPage); } @@ -73,4 +73,17 @@ public class EbikeBikeOrderController { ebikeBikeOrderService.createInspectionSwapOrder(bikeCode); return JsonResult.success(); } + + /** + * 生成调度工单。 + * + * @param bikeCode 车辆编号 + * @param siteId 站点ID(目的地站点) + * @return 结果 + */ + @GetMapping("dispatchSwapOrder") + public JsonResult dispatchSwapOrder(@NotNull(message = "车辆编号不能为空") String bikeCode,@NotNull(message = "站点ID不能为空")Long siteId) { + ebikeBikeOrderService.createDispatchSwapOrder(bikeCode,siteId); + return JsonResult.success(); + } } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java b/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java index 9d8654e..80387d3 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java @@ -26,19 +26,8 @@ public interface BikeUsageStatus { */ int REPAIR = 3; - /** - * 调度中 - */ - int DISPATCH = 4; - - - /** - * 维修中 - */ - int UNDER_REPAIR = 5; - /** * 待调度 */ - int DEPLOYED = 6; + int DEPLOYED = 4; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java index 8220755..0f0243a 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java @@ -107,4 +107,9 @@ public class EbikeBikeOrder implements Serializable { */ private Long createdBy; + /** + * 站点ID + */ + private Long siteId; + } 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 e6dfb1a..68a3619 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 @@ -27,6 +27,7 @@ public interface EbikeBikeOrderService extends IService { /** * 根据车辆编号(bikeCode)生成车辆调度工单 * @param bikeCode 车辆编号 + * @param siteId 站点ID(目的地站点) */ - void createDispatchSwapOrder(String bikeCode); + void createDispatchSwapOrder(String bikeCode,Long siteId); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index 0d108fd..31046ab 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -293,7 +293,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl