From f67945d53b20f6a45ae50b27d74c966eb1355bb4 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 16 十一月 2025 22:53:54 +0800
Subject: [PATCH] feat: 增加分段GPS计算行程距离

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
index f3017e6..66fa440 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
@@ -5,14 +5,21 @@
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+import java.io.Serializable;
+
 /**
  * 杞﹁締淇℃伅瀵硅薄 tb_vehicle_info
  */
-public class VehicleInfo extends BaseEntity {
+public class VehicleInfo extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 杞﹁締ID */
     private Long vehicleId;
+
+    /** 鏃х郴缁熻溅杈咺D(SQL Server CarID) */
+    @Excel(name = "鏃х郴缁熻溅杈咺D")
+    private Integer carId;
 
     /** 璁惧ID */
     @Excel(name = "璁惧ID")
@@ -49,6 +56,12 @@
     /** 褰掑睘閮ㄩ棬鍚嶇О */
     @Excel(name = "褰掑睘閮ㄩ棬")
     private String deptName;
+    
+    /** 褰掑睘鐨勫涓垎鍏徃ID鍒楄〃锛堢敤浜庢煡璇㈠拰鏄剧ず锛� */
+    private List<Long> deptIds;
+    
+    /** 褰掑睘鐨勫涓垎鍏徃鍚嶇О鍒楄〃锛堢敤浜庢樉绀猴級 */
+    private List<String> deptNames;
 
     public void setVehicleId(Long vehicleId) {
         this.vehicleId = vehicleId;
@@ -56,6 +69,14 @@
 
     public Long getVehicleId() {
         return vehicleId;
+    }
+
+    public void setCarId(Integer carId) {
+        this.carId = carId;
+    }
+
+    public Integer getCarId() {
+        return carId;
     }
 
     public void setDeviceId(String deviceId) {
@@ -129,11 +150,28 @@
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+    
+    public List<Long> getDeptIds() {
+        return deptIds;
+    }
+    
+    public void setDeptIds(List<Long> deptIds) {
+        this.deptIds = deptIds;
+    }
+    
+    public List<String> getDeptNames() {
+        return deptNames;
+    }
+    
+    public void setDeptNames(List<String> deptNames) {
+        this.deptNames = deptNames;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("vehicleId", getVehicleId())
+                .append("carId", getCarId())
                 .append("deviceId", getDeviceId())
                 .append("vehicleNo", getVehicleNo())
                 .append("vehicleType", getVehicleType())
@@ -150,4 +188,16 @@
                 .append("remark", getRemark())
                 .toString();
     }
-} 
\ No newline at end of file
+    
+    /**
+     * 鍒濆鍖栧欢杩熷姞杞界殑灞炴�э紝閬垮厤搴忓垪鍖栭棶棰�
+     */
+    public void initializeLazyProperties() {
+        if (this.deptIds != null) {
+            this.deptIds.size(); // 瑙﹀彂鍔犺浇
+        }
+        if (this.deptNames != null) {
+            this.deptNames.size(); // 瑙﹀彂鍔犺浇
+        }
+    }
+}

--
Gitblit v1.9.1