From 7b4f714af1d0d48c116ec1e1c2cbec81c40d0ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Sat, 12 Apr 2025 17:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bst/orderDevice/domain/OrderDeviceVO.java | 31 +++++++++----------
 .../orderDevice/mapper/OrderDeviceMapper.xml  |  3 ++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDeviceVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDeviceVO.java
index 40e54eb..7263c3d 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDeviceVO.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDeviceVO.java
@@ -11,39 +11,38 @@ import lombok.Data;
 @Data
 public class OrderDeviceVO extends OrderDevice{
 
+    // 订单信息
     @ApiModelProperty("订单编号")
     private String orderNo;
-
-    @ApiModelProperty("设备剩余电量（%）")
-    private BigDecimal deviceRemainingPower;
-
-    @ApiModelProperty("设备锁状态")
-    private String deviceLockStatus;
-    
     @ApiModelProperty("订单用户ID")
     private Long orderUserId;
-
     @ApiModelProperty("订单用户名称")
     private String orderUserName;
-
-    @ApiModelProperty("商户名称")
-    private String deviceMchName;
-
     @ApiModelProperty("订单开始时间")
     private LocalDateTime orderStartTime;
-
     @ApiModelProperty("订单结束时间")
     private LocalDateTime orderEndTime;
-
     @ApiModelProperty("订单最大可用时间")
     private LocalDateTime orderMaxTime;
-
     @ApiModelProperty("订单运营区ID")
     private Long orderAreaId;
-
     @ApiModelProperty("运营区是否开启还车审核")
     private Boolean orderAreaReturnVerify;
 
+    // 设备信息
+    @ApiModelProperty("设备剩余电量（%）")
+    private BigDecimal deviceRemainingPower;
+    @ApiModelProperty("设备在线状态")
+    private String deviceOnlineStatus;
+    @ApiModelProperty("设备经度")
+    private BigDecimal deviceLongitude;
+    @ApiModelProperty("设备纬度") 
+    private BigDecimal deviceLatitude;
+    @ApiModelProperty("设备锁状态")
+    private String deviceLockStatus;
+    @ApiModelProperty("设备商户名称")
+    private String deviceMchName;
+
     // 设备剩余续航（公里）
     public BigDecimal getDeviceRemainEndurance() {
         BigDecimal remainEndurance = MathUtils.mulDecimal(getDeviceRemainingPower(), getDeviceModelFullEndurance());
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml
index e00b448..d410175 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml
@@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bo.area_id as order_area_id,
             bd.remaining_power as device_remaining_power,
             bd.lock_status as device_lock_status,
+            bd.online_status as device_online_status,
+            bd.longitude as device_longitude,
+            bd.latitude as device_latitude,
             su.nick_name as order_user_name,
             mch.nick_name as device_mch_name
         from bst_order_device bod