From ef6a2fb3b547190f35b3baf99280eaead42b4f57 Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期五, 09 五月 2025 17:09:49 +0800 Subject: [PATCH] fix:y优化回调处理,和http请求超时处理 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java index 9f16903..3d7f7fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java +++ b/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(); } -- Gitblit v1.9.1