From 3ca7532ed5f961c7a58751796b1707882628d783 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 30 Apr 2025 10:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E8=AE=B0=E5=BD=95=E7=BB=8F?=
 =?UTF-8?q?=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/pojo/EbikeBikeBatterychange.java               | 9 +++++++++
 .../service/impl/EbikeBikeInfoServiceImpl.java           | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeBatterychange.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeBatterychange.java
index c48d757a..ab00f4f0 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeBatterychange.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeBatterychange.java
@@ -61,6 +61,15 @@ public class EbikeBikeBatterychange implements Serializable {
      */
     private String orderId;
 
+    /**
+     * 经度
+     */
+    private Double lng;
+
+    /**
+     * 纬度
+     */
+    private Double lat;
     /**
      * 创建时间
      */
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 db09e7a6..f9108df2 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
@@ -2,6 +2,7 @@ package com.cdzy.ebikemaintenance.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
 import com.cdzy.common.model.CoreResult;
@@ -734,6 +735,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         QueryWrapper query = QueryWrapper.create().where(EBIKE_BIKE_INFO.BIKE_CODE.eq(changeDto.getBikeCode()));
         EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneByQuery(query);
         String oldBatteryId = ebikeBikeInfo.getBatteryId();
+        String ecuId = ebikeBikeInfo.getEcuId();
 
         query.clear();
         query.where(EBIKE_BATTERY_INFO.BATTERY_CODE.eq(changeDto.getNewBatteryCode()));
@@ -759,6 +761,11 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         batteryChange.setObatteryId(oldBatteryId);
         batteryChange.setOperateUser(String.valueOf(staffFeign.getStaffId()));
         batteryChange.setOrderId(orderId);
+        EbikeEcuInfo ebikeEcuInfo = ebikeEcuInfoMapper.selectOneById(ecuId);
+        Object object = redisUtil.get(ebikeEcuInfo.getEcuSn());
+        ResGPSDto resGPSDto = JSON.toJavaObject(object, ResGPSDto.class);
+        batteryChange.setLng(resGPSDto.getLongitude());
+        batteryChange.setLat(resGPSDto.getLatitude());
         ebikeBikeBatterychangeMapper.insert(batteryChange);
     }