From fcb6180bd21570861ded10db86a629096fa34e21 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Tue, 22 Apr 2025 16:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E5=B7=A5=E5=8D=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D=E3=80=81=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E3=80=81=E8=87=AA=E5=8A=A8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ebike/feign/clients/MaintenanceFeignClient.java  | 9 +++++++++
 .../service/impl/EbikeBikeOrderServiceImpl.java          | 4 +++-
 .../com/cdzy/ebikereport/component/ReoprtHandler.java    | 8 ++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
index 2cc0fb05..ea315d58 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
@@ -81,4 +81,13 @@ public interface MaintenanceFeignClient {
      */
     @PostMapping("ebikeBikeInfo/deleteBatteryInfo")
     JsonResult<List<RspBikeInfo>> deleteBatteryInfo(@RequestBody List<String> batteryCodes);
+
+    /**
+     * 根据ecuSn生成换电工单
+     *
+     * @param ecuSn 中控编号编号
+     * @return 结果
+     */
+    @GetMapping("ebikeOrder/changeBattery")
+    JsonResult<?> changeBattery(@RequestParam(name = "ecuSn") String ecuSn);
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
index 6d0c3d19..03fd447e 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
@@ -39,10 +39,11 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         EbikeBikeInfo ebikeBikeInfo = infoMapper.selectOneByQuery(queryWrapper);
         queryWrapper.clear();
         queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(ebikeBikeInfo.getBikeId()))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
         EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper);
         if (order != null) {
-            throw new RuntimeException("该车辆已存在换电工单，无需重复生成");
+            throw new RuntimeException("该车辆存在未完成的换电工单，无需重复生成");
         }
         //生成工单
         EbikeBikeOrder bikeOrder = new EbikeBikeOrder();
@@ -57,6 +58,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     public void doneChangeBattery(String bikeId, String receiverId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
         EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
         if (bikeOrder == null){
diff --git a/ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java b/ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java
index f7593b36..f86b0646 100644
--- a/ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java
+++ b/ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java
@@ -6,6 +6,7 @@ import com.cdzy.common.model.ResGPSDto;
 import com.cdzy.ebikereport.enums.BitSwitch;
 import com.cdzy.ebikereport.utils.BinaryUtil;
 import com.cdzy.ebikereport.utils.RedisUtil;
+import com.ebike.feign.clients.MaintenanceFeignClient;
 import com.ebike.feign.clients.OperateFeignClient;
 import jakarta.annotation.Resource;
 import org.springframework.data.geo.Point;
@@ -25,6 +26,9 @@ public class ReoprtHandler {
     @Resource
     private OperateFeignClient operateFeignClient;
 
+    @Resource
+    private MaintenanceFeignClient maintenanceFeignClient;
+
     /**
      * 报文处理
      */
@@ -48,8 +52,8 @@ public class ReoprtHandler {
         char isWheelSpin = binary.charAt(BitSwitch.IS_WHEEL_SPIN);
         char isMoving = binary.charAt(BitSwitch.IS_MOVING);
         ResGPSDto resGpsDto = param.toJavaObject(ResGPSDto.class);
-        if (resGpsDto.getSoc() < 20){
-            //TODO:生成换电工单
+        if (resGpsDto.getSoc() > 0 && resGpsDto.getSoc() < 20){
+            maintenanceFeignClient.changeBattery(deviceId);
         }
         resGpsDto.setEcuSn(deviceId);
         resGpsDto.setHelmetExit(helmet);