From 69c1c0fa4b17a3564e02e68cb5596a774bc81335 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 5 Jun 2025 15:18:31 +0800
Subject: [PATCH] =?UTF-8?q?gps=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cdzy/common/model/ResGPSDto.java       | 5 +++++
 .../model/dto/response/ResEbikeInfoRegionDto.java            | 1 +
 .../service/impl/EbikeBikeInfoServiceImpl.java               | 4 ++++
 .../java/com/cdzy/ebikereport/component/ReoprtHandler.java   | 1 +
 4 files changed, 11 insertions(+)

diff --git a/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java b/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
index 472aa31e..ef08f43c 100644
--- a/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
+++ b/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
@@ -108,4 +108,9 @@ public class ResGPSDto {
      * 最后一次还车时间
      */
     private Number latestTimestamp;
+
+    /**
+     * 电量更新时间戳
+     */
+    private Long refreshTimestamp;
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/response/ResEbikeInfoRegionDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/response/ResEbikeInfoRegionDto.java
index 83013e9b..52b1d29c 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/response/ResEbikeInfoRegionDto.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/response/ResEbikeInfoRegionDto.java
@@ -137,4 +137,5 @@ public class ResEbikeInfoRegionDto {
      */
     private Integer intervalTime;
 
+    private Long refreshTimestamp;
 }
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 63c4b54a..edb54122 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
@@ -1573,6 +1573,10 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 resEbikeInfoRegionDto.setLatestTimestamp(String.valueOf(latestTimestamp));
                 resEbikeInfoRegionDto.setIntervalTime(TimeUtils.hoursSince(latestTimestamp.longValue()));
             }
+            Long refreshTimestamp = resGPSDto.getRefreshTimestamp();
+            if (refreshTimestamp != null) {
+                resEbikeInfoRegionDto.setRefreshTimestamp(refreshTimestamp);
+            }
             resEbikeInfoRegionDto.setInOperation(resGPSDto.getInOperation());
             resEbikeInfoRegionDto.setInParking(resGPSDto.getInParking());
         });
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 461ccdfa..a4fbd574 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
@@ -64,6 +64,7 @@ public class ReoprtHandler {
         resGpsDto.setIsHelmetLocked(isHelmetLocked);
         resGpsDto.setIsWheelSpin(isWheelSpin);
         resGpsDto.setIsMoving(isMoving);
+        resGpsDto.setRefreshTimestamp(System.currentTimeMillis());
         redisUtil.set(deviceId, resGpsDto);
         double[] doubles = CoordinateUtil.WGS84ToGCJ02(resGpsDto.getLongitude(), resGpsDto.getLatitude());
         redisUtil.addLocation(new Point(doubles[0], doubles[1]),deviceId);