From d577d2db064bb54f50e8225659b03e4219b0dcbba714dc2a4b13117d450ec552 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Tue, 25 Nov 2025 10:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=88=E5=BE=85=E7=94=A8=E6=88=B7=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=B7=A1=E6=A3=80=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/clients/OperationsFeignClient.java  |  9 +++++
 .../controller/EbikeBikeOrderController.java  | 14 +++++++-
 .../service/EbikeBikeOrderService.java        |  9 ++++-
 .../impl/EbikeBikeOrderServiceImpl.java       | 33 ++++++++++++++++++-
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java
index 6292a68..9f46b0f 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java
@@ -63,4 +63,13 @@ public interface OperationsFeignClient {
     @GetMapping("/ebikeBikeOrder/batterySwapOrder")
     JsonResult<FeignEbikeUserBikeInfo> batterySwapOrder(@RequestParam("ecuSn")String ecuSn);
 
+
+    /**
+     * 根据bikeCode生成巡检工单
+     *
+     * @return 结果
+     */
+    @GetMapping("/ebikeBikeOrder/inspectionSwapOrder")
+    JsonResult<FeignEbikeUserBikeInfo> inspectionSwapOrder(@RequestParam("bikeCode")String bikeCode);
+
 }
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 d17b8ef..f50768b 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
@@ -9,6 +9,7 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.util.StringUtil;
 import jakarta.annotation.Resource;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,9 +57,20 @@ public class EbikeBikeOrderController {
      * @return 结果
      */
     @GetMapping("batterySwapOrder")
-    public JsonResult<?> batterySwapOrder(String ecuSn) {
+    public JsonResult<?> batterySwapOrder(@NotNull(message = "中控编号不能为空") String ecuSn) {
         ebikeBikeOrderService.createBatterySwapOrder(ecuSn);
         return JsonResult.success();
     }
 
+    /**
+     * 生成巡检工单。
+     *
+     * @param bikeCode 车辆编号
+     * @return 结果
+     */
+    @GetMapping("inspectionSwapOrder")
+    public JsonResult<?> inspectionSwapOrder(@NotNull(message = "车辆编号不能为空") String bikeCode) {
+        ebikeBikeOrderService.createInspectionSwapOrder(bikeCode);
+        return JsonResult.success();
+    }
 }
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 aaeb9fd..6e8467d 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
@@ -12,8 +12,15 @@ import com.cdzy.operations.model.entity.EbikeBikeOrder;
 public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
 
     /**
-     * 根据EcuSn生成车辆换电工单
+     * 根据中控编码（EcuSn）生成车辆换电工单
      * @param ecuSn 中控编码
      */
     void createBatterySwapOrder(String ecuSn);
+
+
+    /**
+     * 根据车辆编号（bikeCode）生成车辆巡检工单
+     * @param bikeCode 中控编码
+     */
+    void createInspectionSwapOrder(String bikeCode);
 }
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 7054fd8..e32b312 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
@@ -3,6 +3,7 @@ package com.cdzy.operations.service.impl;
 import com.cdzy.common.ex.EbikeException;
 import com.cdzy.operations.enums.BikeOrderType;
 import com.cdzy.operations.enums.BikeStatus;
+import com.cdzy.operations.mapper.EbikeBikeInfoMapper;
 import com.cdzy.operations.mapper.EbikeBikeOrderMapper;
 import com.cdzy.operations.mapper.EbikeEcuInfoMapper;
 import com.cdzy.operations.model.entity.EbikeBikeInfo;
@@ -34,6 +35,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Resource
     EbikeEcuInfoMapper ebikeEcuInfoMapper;
 
+    @Resource
+    EbikeBikeInfoMapper bikeInfoMapper;
+
     @Override
     public void createBatterySwapOrder(String ecuSn) {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -47,7 +51,8 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
             throw new EbikeException("创建换电工单失败，中控编号错误");
         }
         queryWrapper.clear();
-        queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()));
+        queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.BATTERY_SWAP));
         EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
         if (bikeOrder != null) {
             log.error("车辆已存在换电工单,bikeCode={} ", bikeInfo.getBikeCode());
@@ -60,4 +65,30 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .build();
         this.mapper.insert(ebikeBikeOrder);
     }
+
+    @Override
+    public void createInspectionSwapOrder(String bikeCode) {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode))
+                .where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH));
+        EbikeBikeInfo bikeInfo = bikeInfoMapper.selectOneByQuery(queryWrapper);
+        if (bikeInfo == null) {
+            log.error("创建巡检工单失败，车辆不存在或未上架,bikeCode={} ", bikeCode);
+            throw new EbikeException("创建巡检工单失败，车辆编号错误");
+        }
+        queryWrapper.clear();
+        queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION));
+        EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
+        if (bikeOrder != null) {
+            log.error("车辆已存在巡检工单,bikeCode={} ", bikeInfo.getBikeCode());
+            throw new EbikeException("车辆已存在巡检工单");
+        }
+        EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder()
+                .bikeCode(bikeInfo.getBikeCode())
+                .orderCode(snowFlakeIDKeyGenerator.nextId())
+                .orderType(BikeOrderType.INSPECTION)
+                .build();
+        this.mapper.insert(ebikeBikeOrder);
+    }
 }