From 310633feef20e9b77d44fd25e0b41778e033b33b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 11 十一月 2025 21:48:46 +0800
Subject: [PATCH] feat: 车辆GPS统计,并修改了一些变更任务状态的逻辑

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 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 359b3c1..5871080 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,6 +5,8 @@
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 杞﹁締淇℃伅瀵硅薄 tb_vehicle_info
  */
@@ -13,6 +15,14 @@
 
     /** 杞﹁締ID */
     private Long vehicleId;
+
+    /** 鏃х郴缁熻溅杈咺D(SQL Server CarID) */
+    @Excel(name = "鏃х郴缁熻溅杈咺D")
+    private Integer carId;
+
+    /** 璁惧ID */
+    @Excel(name = "璁惧ID")
+    private String deviceId;
 
     /** 杞︾墝鍙� */
     @Excel(name = "杞︾墝鍙�")
@@ -34,12 +44,46 @@
     @Excel(name = "鐘舵��", readConverterExp = "0=姝e父,1=鍋滅敤")
     private String status;
 
+    /** 骞冲彴鏍囪瘑 */
+    @Excel(name = "骞冲彴鏍囪瘑")
+    private String platformCode;
+
+    /** 褰掑睘閮ㄩ棬ID */
+    @Excel(name = "褰掑睘閮ㄩ棬ID")
+    private Long deptId;
+
+    /** 褰掑睘閮ㄩ棬鍚嶇О */
+    @Excel(name = "褰掑睘閮ㄩ棬")
+    private String deptName;
+    
+    /** 褰掑睘鐨勫涓垎鍏徃ID鍒楄〃锛堢敤浜庢煡璇㈠拰鏄剧ず锛� */
+    private List<Long> deptIds;
+    
+    /** 褰掑睘鐨勫涓垎鍏徃鍚嶇О鍒楄〃锛堢敤浜庢樉绀猴級 */
+    private List<String> deptNames;
+
     public void setVehicleId(Long vehicleId) {
         this.vehicleId = vehicleId;
     }
 
     public Long getVehicleId() {
         return vehicleId;
+    }
+
+    public void setCarId(Integer carId) {
+        this.carId = carId;
+    }
+
+    public Integer getCarId() {
+        return carId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
     }
 
     public void setVehicleNo(String vehicleNo) {
@@ -82,15 +126,60 @@
         return status;
     }
 
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    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())
                 .append("vehicleBrand", getVehicleBrand())
                 .append("vehicleModel", getVehicleModel())
                 .append("status", getStatus())
+                .append("platformCode", getPlatformCode())
+                .append("deptId", getDeptId())
+                .append("deptName", getDeptName())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

--
Gitblit v1.9.1