From 5cb28e43711c5934b0a6860000a219b58636df3ab76bf5b983235fb05e82a132 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 4 Dec 2025 09:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=9C=80=E5=90=8E=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cdzy/common/model/dto/ResGPSDto.java  |  12 +-
 .../model/dto/EbikeOrderBikeInfoDto.java      | 134 ++++++++++--------
 .../cdzy/report/component/ReoprtHandler.java  |   3 +
 3 files changed, 88 insertions(+), 61 deletions(-)

diff --git a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
index bbe2cd0..95bb00a 100644
--- a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
+++ b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java
@@ -2,6 +2,8 @@ package com.cdzy.common.model.dto;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author attiya
  * @since 2025-03-20
@@ -104,13 +106,15 @@ public class ResGPSDto {
      */
     private Boolean inParking;
 
-    /**
-     * 最后一次还车时间
-     */
-    private Number latestTimestamp;
 
     /**
      * 放电状态：0-关闭（断电） 1-打开（通电）
      */
     private Integer mosState;
+
+    /**
+     * 最后一次上报时间
+     */
+    private LocalDateTime latestTime;
+
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
index 8229ab5..884dea6 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
@@ -36,40 +36,6 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Long bikeInfoId;
 
-    /**
-     * 运营商ID
-     */
-    private Long operatorId;
-
-    /**
-     * 运营区ID
-     */
-    private Long regionId;
-
-    /**
-     * 运营区名称
-     */
-    private String regionName;
-
-    /**
-     * 车辆编号（与车辆二维码编号相同
-     */
-    private String bikeCode;
-
-    /**
-     * 电池ID
-     */
-    private Long batteryId;
-
-    /**
-     * 中控ID
-     */
-    private Long ecuId;
-
-    /**
-     * 头盔ID
-     */
-    private Long helmetId;
 
     /**
      * 定位
@@ -79,15 +45,6 @@ public class EbikeOrderBikeInfoDto implements Serializable {
     @JsonDeserialize(using = PGpointDeserializer.class)
     private PGpoint location;
 
-    /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
-     * 车辆状态
-     */
-    private Integer status;
 
     /**
      * 车辆使用状态
@@ -95,35 +52,98 @@ public class EbikeOrderBikeInfoDto implements Serializable {
     private Integer usageStatus;
 
     /**
-     * 创建时间
+     * 外接电池电量（该值由控制器提供，若控制器不支持此值为0）
      */
-    @Column(onInsertValue = "now()")
-    private LocalDateTime createdAt;
+    private Integer soc;
 
     /**
-     * 创建人
+     * 外接电源电压，单位：毫伏
      */
-    private Long createdBy;
+    private Integer voltage;
 
     /**
-     * 修改时间
+     * GPS信号强度【0-31】
      */
-    @Column(onUpdateValue = "now()")
-    private LocalDateTime updatedAt;
+    private Integer gsm;
 
     /**
-     * 修改人
+     * 时间戳
      */
-    private Long updatedBy;
+    private Number timestamp;
 
     /**
-     * 删除与否
+     * 0: 头盔不在位 1: 头盔在位
      */
-    private Boolean isDeleted;
+    private Character helmetExit;
 
     /**
-     * 是否包含头盔
+     * 0: 头盔锁未上锁 1: 头盔锁已上锁
      */
-    private Boolean hasHelme;
+    private Character isHelmetLocked;
+
+    /**
+     * 0:后轮静止 1:后轮转动（轮动状态
+     */
+    private Character isWheelSpin;
+
+    /**
+     * 0:撤防状态 1:设防状态
+     */
+    private Character isDefendOn;
+
+    /**
+     * 0: 车辆静止 1: 车辆移动（运动状态
+     */
+    private Character isMoving;
+
+    /**
+     * 0:电门关闭 1:电门打开
+     */
+    private Character accOn;
+
+    /**
+     * 0:后轮未锁 1:后轮已锁
+     */
+    private Character wheelLocked;
+
+    /**
+     * 0:电池仓未锁 1:电池仓已锁
+     */
+    private Character seatLocked;
+
+    /**
+     * 速度
+     */
+    private Float speed;
+
+    /**
+     * 中文位置
+     */
+    private String chineseLocation;
+
+    /**
+     * ecuSn
+     */
+    private String ecuSn;
+
+    /**
+     * 是否在运营区（记录最后一次用户停车
+     */
+    private Boolean inOperation;
+
+    /**
+     * 是否在停车区（记录最后一次用户停车
+     */
+    private Boolean inParking;
+
+    /**
+     * 最后一次上报时间
+     */
+    private LocalDateTime latestTime;
+
+    /**
+     * 放电状态：0-关闭（断电） 1-打开（通电）
+     */
+    private Integer mosState;
 
 }
diff --git a/ebike-report/src/main/java/com/cdzy/report/component/ReoprtHandler.java b/ebike-report/src/main/java/com/cdzy/report/component/ReoprtHandler.java
index 8be78e3..ddc8181 100644
--- a/ebike-report/src/main/java/com/cdzy/report/component/ReoprtHandler.java
+++ b/ebike-report/src/main/java/com/cdzy/report/component/ReoprtHandler.java
@@ -14,6 +14,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 
 /**
  * @author attiya
@@ -79,6 +81,7 @@ public class ReoprtHandler {
         resGpsDto.setIsHelmetLocked(isHelmetLocked);
         resGpsDto.setIsWheelSpin(isWheelSpin);
         resGpsDto.setIsMoving(isMoving);
+        resGpsDto.setLatestTime(LocalDateTime.now());
         redisUtil.saveEcu(deviceId, resGpsDto);
         double[] doubles = CoordinateUtil.WGS84ToGCJ02(resGpsDto.getLongitude(), resGpsDto.getLatitude());
         boolean outOfChina = CoordinateUtil.outOfChina(doubles[0], doubles[1]);