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 fcf0e22..39be0e3 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 @@ -233,17 +233,17 @@ public class EbikeBikeOrderController { return JsonResult.success(); } -// /** -// * 完成调度工单。 -// * -// * @param bikeCode 车辆编号 -// * @return 结果 -// */ -// @GetMapping("bikeDispatch") -// public JsonResult bikeDispatch(@NotNull(message = "车辆编号不能为空") String bikeCode,@NotNull(message = "站点ID不能为空")Long siteId) { -// ebikeBikeOrderService.bikeDispatch(bikeCode,siteId); -// return JsonResult.success(); -// } + /** + * 完成调度工单。 + * + * @param doneDispatchOrderVo 调度信息 + * @return 结果 + */ + @GetMapping("bikeDispatch") + public JsonResult bikeDispatch(@RequestBody @Validated DoneDispatchOrderVo doneDispatchOrderVo) { + ebikeBikeOrderService.bikeDispatch(doneDispatchOrderVo); + return JsonResult.success(); + } /** * 运营区列表(工单用) diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneDispatchOrderVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneDispatchOrderVo.java new file mode 100644 index 0000000..51c1c2d --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneDispatchOrderVo.java @@ -0,0 +1,38 @@ +package com.cdzy.operations.model.vo; + +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author attiya + * @since 2025-11-26 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DoneDispatchOrderVo { + + /** + * 车辆编号 + */ + @NotNull(message = "车辆编号不能为空") + private String bikeCode; + + @NotNull(message = "站点ID不能为空") + private Long siteId; + /** + * 文件地址 + */ + private List fileUrls; + + /** + * 备注 + */ + private String remarks; +} 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 03577e7..51afd78 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 @@ -106,10 +106,9 @@ public interface EbikeBikeOrderService extends IService { /** * 完成调度 - * @param bikeCode 车辆编号 - * @param siteId 站点ID + * @param doneDispatchOrderVo 调度信息 */ - void bikeDispatch(String bikeCode, Long siteId); + void bikeDispatch(DoneDispatchOrderVo doneDispatchOrderVo); /** * 完成巡检 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 83c2670..50690ad 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 @@ -552,7 +552,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl