From f76f4004b0f821f3f45c3ee2f57650130b097d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com>
Date: Wed, 30 Apr 2025 14:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/ReqEbikeDispatchRecordDto.java   | 11 +++++++++++
 .../model/pojo/EbikeDispatchRecords.java         |  8 ++++----
 .../service/impl/EbikeBikeInfoServiceImpl.java   | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java
index 5f4c84a8..5b70265b 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java
@@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Id;
 import lombok.Data;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 @Data
 public class ReqEbikeDispatchRecordDto {
@@ -20,4 +21,14 @@ public class ReqEbikeDispatchRecordDto {
         @Column(onInsertValue = "0")
         private String dispatchState;
 
+        /**
+         * 调度前车辆经度
+         */
+        private Double startVehicleLng;
+
+        /**
+         * 调度前车辆纬度
+         */
+        private Double startVehicleLat;
+
     }
\ No newline at end of file
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java
index 48b849eb..accae7a4 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java
@@ -90,22 +90,22 @@ public class EbikeDispatchRecords implements Serializable {
     /**
      * 调度前车辆纬度
      */
-    private BigDecimal startVehicleLat;
+    private Double startVehicleLat;
 
     /**
      * 调度前车辆经度
      */
-    private BigDecimal startVehicleLng;
+    private Double startVehicleLng;
 
     /**
      * 调度后车辆纬度
      */
-    private BigDecimal endVehicleLat;
+    private Double endVehicleLat;
 
     /**
      * 调度后车辆经度
      */
-    private BigDecimal endVehicleLng;
+    private Double endVehicleLng;
 
     /**
      * 创建时间，表示记录创建的时间
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index f9108df2..600d5a2f 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -1162,6 +1162,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
      * @param eqWorkOrderDispatchDto
      * @return
      */
+    @Transactional  // 添加事务注解
     public String createWorkOrderDispatch(ReqWorkOrderDispatchDto eqWorkOrderDispatchDto) {
         try {
             // 获取 token 和用户信息
@@ -1188,14 +1189,24 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeScheduleWorkOrderExtension.setId(ebikeBikeOrder.getOrderId());
             ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
             ebikeScheduleWorkOrderExtension.setSiteId(eqWorkOrderDispatchDto.getSiteId());//站点id
+            ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
             ebikeScheduleWorkOrderExtensionMapper.insert(ebikeScheduleWorkOrderExtension);
             // 创建并保存调度记录
             List<EbikeDispatchRecords> records = new ArrayList<>();
             for (String bikeCode : eqWorkOrderDispatchDto.getBikeCodes()) {
                 EbikeDispatchRecords dispatchRecord = new EbikeDispatchRecords();
+                //获取经纬度
+                ResEbikeBikeAndEcuCodeDto bikeINfoData = getBikeINfoData(bikeCode);
+                ResGPSDto resGPSDto = bikeINfoData.getResGPSDto();
+                if(resGPSDto!=null){
+                    Double latitude = resGPSDto.getLatitude();
+                    Double longitude = resGPSDto.getLongitude();
+                    dispatchRecord.setStartVehicleLng(latitude);
+                    dispatchRecord.setStartVehicleLat(longitude);
+                }
                 dispatchRecord.setOrderId(ebikeBikeOrder.getOrderId());
                 dispatchRecord.setBikeCode(bikeCode);
-                dispatchRecord.setStartStation(eqWorkOrderDispatchDto.getSiteId());
+                dispatchRecord.setStartStationId(eqWorkOrderDispatchDto.getSiteId());
                 records.add(dispatchRecord);
             }
             // 批量插入调度记录（如果支持批量插入的话）
@@ -1210,7 +1221,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             // 异常处理，记录日志并抛出自定义异常或包装成 RuntimeException
             // 可以使用日志工具，例如 log4j 或 slf4j，记录错误详细信息
             log.error("创建工单调度失败", e);
-
             // 可根据需求抛出更具体的异常
             throw new RuntimeException("创建工单调度时发生异常", e);
         }
@@ -1259,6 +1269,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         EbikeDispatchRecords ebikeDispatchRecords = new EbikeDispatchRecords();
         ebikeDispatchRecords.setOrderId(ebikeDispatchRecordDto.getOrderId());
         ebikeDispatchRecords.setBikeCode(ebikeDispatchRecordDto.getBikeCode());
+        ebikeDispatchRecords.setStartVehicleLng(ebikeDispatchRecordDto.getStartVehicleLng());
+        ebikeDispatchRecords.setStartVehicleLat(ebikeDispatchRecordDto.getStartVehicleLat());
         ebikeDispatchRecords.setDispatchState(ebikeDispatchRecordDto.getDispatchState());
          ebikeDispatchRecordsMapper.insert(ebikeDispatchRecords);
         return ebikeDispatchRecords;