Merge remote-tracking branch 'origin/master'

wzp

2025-05-08 435f6e023163ccee35dda99e9c07c187c8f0b9c6

 ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java

@@ -18,6 +18,10 @@
    @Excel(name = "车辆ID")
    private Long vehicleId;

    /** 设备ID */
    @Excel(name = "设备ID")
    private String deviceId;

    /** 车牌号 */
    @Excel(name = "车牌号")
    private String vehicleNo;
@@ -43,8 +47,22 @@
    private Double direction;

    /** 采集时间 */
    @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "采集时间")
    private String collectTime;

    /** GPS上报设备时间 */
    @Excel(name = "GPS上报设备时间")
    private String deviceReportTime;

    /** GPS平台处理时间 */
    @Excel(name = "GPS平台处理时间")
    private String platformProcessTime;

    /** 开始时间 */
    private String beginTime;

    /** 结束时间 */
    private String endTime;

    public void setGpsId(Long gpsId) {
        this.gpsId = gpsId;
@@ -60,6 +78,14 @@

    public Long getVehicleId() {
        return vehicleId;
    }

    public void setDeviceId(String deviceId) {
        this.deviceId = deviceId;
    }

    public String getDeviceId() {
        return deviceId;
    }

    public void setVehicleNo(String vehicleNo) {
@@ -118,11 +144,44 @@
        return collectTime;
    }

    public void setDeviceReportTime(String deviceReportTime) {
        this.deviceReportTime = deviceReportTime;
    }

    public String getDeviceReportTime() {
        return deviceReportTime;
    }

    public void setPlatformProcessTime(String platformProcessTime) {
        this.platformProcessTime = platformProcessTime;
    }

    public String getPlatformProcessTime() {
        return platformProcessTime;
    }

    public String getBeginTime() {
        return beginTime;
    }

    public void setBeginTime(String beginTime) {
        this.beginTime = beginTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("gpsId", getGpsId())
                .append("vehicleId", getVehicleId())
                .append("deviceId", getDeviceId())
                .append("vehicleNo", getVehicleNo())
                .append("longitude", getLongitude())
                .append("latitude", getLatitude())
@@ -130,6 +189,8 @@
                .append("speed", getSpeed())
                .append("direction", getDirection())
                .append("collectTime", getCollectTime())
                .append("deviceReportTime", getDeviceReportTime())
                .append("platformProcessTime", getPlatformProcessTime())
                .append("createTime", getCreateTime())
                .toString();
    }