From afdb93839d2b9ad4a3e85fc6c075f38687bc208c7b6c36710eb331501e49875a Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Mon, 8 Dec 2025 16:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeBikeOrderController.java | 18 ++++++-- .../model/dto/EbikeOrderBikeInfoDto.java | 5 +++ .../operations/model/vo/DoneFaultOrderVo.java | 42 +++++++++++++++++++ .../service/EbikeBikeOrderService.java | 8 +++- .../impl/EbikeBikeOrderServiceImpl.java | 16 ++++++- 5 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneFaultOrderVo.java 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 723c73c..fcf0e22 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 @@ -152,6 +152,18 @@ public class EbikeBikeOrderController { return JsonResult.success(); } + /** + * 完成维修工单。 + * + * @param faultOrderVo 故障信息 + * @return 结果 + */ + @PostMapping("doFault") + public JsonResult doFault(@Validated @RequestBody DoneFaultOrderVo faultOrderVo) { + ebikeBikeOrderService.doFault(faultOrderVo); + return JsonResult.success(); + } + /** * 接取工单。 * @@ -234,7 +246,7 @@ public class EbikeBikeOrderController { // } /** - * 运营区列表列表（工单用） + * 运营区列表（工单用） * * @return 操作结果 */ @@ -261,8 +273,8 @@ public class EbikeBikeOrderController { * @return 操作结果 */ @GetMapping("bikeInfo") - public JsonResult bikeInfo(@RequestParam("bikeCode") String bikeCode) throws IOException { - EbikeOrderBikeInfoDto info = ebikeBikeOrderService.bikeInfo(bikeCode); + public JsonResult bikeInfo(@RequestParam("bikeCode") String bikeCode,Integer orderType) throws IOException { + EbikeOrderBikeInfoDto info = ebikeBikeOrderService.bikeInfo(bikeCode,orderType); return JsonResult.success(info); } } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java index bcfa603..30d948a 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java @@ -126,6 +126,11 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private LocalDateTime latestTime; + /** + * 最后一次上报时间 + */ + private LocalDateTime createdAt; + /** * 是否在线 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneFaultOrderVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneFaultOrderVo.java new file mode 100644 index 0000000..4b6f6a6 --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneFaultOrderVo.java @@ -0,0 +1,42 @@ +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 DoneFaultOrderVo { + + /** + * 车辆编号 + */ + @NotNull(message = "车辆编号不能为空") + private String bikeCode; + + /** + * 处理类型：1-故障误报 2-故障处理 + */ + @NotNull(message = "处理类型不能为空") + private Integer type; + + /** + * 文件地址 + */ + 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 69d520a..03577e7 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 @@ -95,7 +95,7 @@ public interface EbikeBikeOrderService extends IService { * @param bikeCode 车辆编号 * @return 详情 */ - EbikeOrderBikeInfoDto bikeInfo(String bikeCode) throws IOException; + EbikeOrderBikeInfoDto bikeInfo(String bikeCode,Integer orderType) throws IOException; /** * 获取车辆列表 @@ -122,4 +122,10 @@ public interface EbikeBikeOrderService extends IService { * @return 列表 */ List regionList(OrderRegionVo orderRegionVo); + + /** + * 完成维修工单 + * @param faultOrderVo 信息 + */ + void doFault(DoneFaultOrderVo faultOrderVo); } 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 0d74fc0..e4b4154 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 @@ -353,7 +353,8 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl