From caf56217dc2bf898b63b0e1f31a7098202c32825 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 15 十一月 2025 16:50:17 +0800
Subject: [PATCH] Merge branch 'feature_gps'
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleMileageStats.java | 151 ++++++++++++++++++++++++--------------------------
1 files changed, 72 insertions(+), 79 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleMileageStats.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleMileageStats.java
index ab5cb3b..a1fe49d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleMileageStats.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleMileageStats.java
@@ -3,19 +3,13 @@
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
- * 杞﹁締閲岀▼缁熻瀵硅薄 vehicle_mileage_stats
- *
- * @author ruoyi
- * @date 2025-01-15
+ * 杞﹁締閲岀▼缁熻瀵硅薄 tb_vehicle_mileage_stats
*/
-public class VehicleMileageStats extends BaseEntity
-{
+public class VehicleMileageStats extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 缁熻ID */
@@ -25,117 +19,116 @@
@Excel(name = "杞﹁締ID")
private Long vehicleId;
+ /** 杞︾墝鍙� */
+ @Excel(name = "杞︾墝鍙�")
+ private String vehicleNo;
+
/** 缁熻鏃ユ湡 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "缁熻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date statsDate;
+ private Date statDate;
/** 鎬婚噷绋�(鍏噷) */
@Excel(name = "鎬婚噷绋�(鍏噷)")
private BigDecimal totalMileage;
- /** 浠诲姟閲岀▼(鍏噷) */
- @Excel(name = "浠诲姟閲岀▼(鍏噷)")
+ /** 浠诲姟鏃舵閲岀▼(鍏噷) */
+ @Excel(name = "浠诲姟鏃舵閲岀▼(鍏噷)")
private BigDecimal taskMileage;
- /** 闈炰换鍔￠噷绋�(鍏噷) */
- @Excel(name = "闈炰换鍔￠噷绋�(鍏噷)")
+ /** 闈炰换鍔℃椂娈甸噷绋�(鍏噷) */
+ @Excel(name = "闈炰换鍔℃椂娈甸噷绋�(鍏噷)")
private BigDecimal nonTaskMileage;
- /** 浠诲姟閲岀▼鍗犳瘮(%) */
- @Excel(name = "浠诲姟閲岀▼鍗犳瘮(%)")
- private BigDecimal taskMileageRatio;
+ /** 浠诲姟閲岀▼鍗犳瘮(0-1) */
+ @Excel(name = "浠诲姟閲岀▼鍗犳瘮")
+ private BigDecimal taskRatio;
- /** GPS鐐规暟 */
- @Excel(name = "GPS鐐规暟")
- private Integer gpsCount;
+ /** GPS鐐规暟閲� */
+ @Excel(name = "GPS鐐规暟閲�")
+ private Integer gpsPointCount;
- public void setStatsId(Long statsId)
- {
+ /** 浠诲姟鏁伴噺 */
+ @Excel(name = "浠诲姟鏁伴噺")
+ private Integer taskCount;
+
+ public Long getStatsId() {
+ return statsId;
+ }
+
+ public void setStatsId(Long statsId) {
this.statsId = statsId;
}
- public Long getStatsId()
- {
- return statsId;
+ public Long getVehicleId() {
+ return vehicleId;
}
- public void setVehicleId(Long vehicleId)
- {
+
+ public void setVehicleId(Long vehicleId) {
this.vehicleId = vehicleId;
}
- public Long getVehicleId()
- {
- return vehicleId;
- }
- public void setStatsDate(Date statsDate)
- {
- this.statsDate = statsDate;
+ public String getVehicleNo() {
+ return vehicleNo;
}
- public Date getStatsDate()
- {
- return statsDate;
+ public void setVehicleNo(String vehicleNo) {
+ this.vehicleNo = vehicleNo;
}
- public void setTotalMileage(BigDecimal totalMileage)
- {
+
+ public Date getStatDate() {
+ return statDate;
+ }
+
+ public void setStatDate(Date statDate) {
+ this.statDate = statDate;
+ }
+
+ public BigDecimal getTotalMileage() {
+ return totalMileage;
+ }
+
+ public void setTotalMileage(BigDecimal totalMileage) {
this.totalMileage = totalMileage;
}
- public BigDecimal getTotalMileage()
- {
- return totalMileage;
+ public BigDecimal getTaskMileage() {
+ return taskMileage;
}
- public void setTaskMileage(BigDecimal taskMileage)
- {
+
+ public void setTaskMileage(BigDecimal taskMileage) {
this.taskMileage = taskMileage;
}
- public BigDecimal getTaskMileage()
- {
- return taskMileage;
+ public BigDecimal getNonTaskMileage() {
+ return nonTaskMileage;
}
- public void setNonTaskMileage(BigDecimal nonTaskMileage)
- {
+
+ public void setNonTaskMileage(BigDecimal nonTaskMileage) {
this.nonTaskMileage = nonTaskMileage;
}
- public BigDecimal getNonTaskMileage()
- {
- return nonTaskMileage;
- }
- public void setTaskMileageRatio(BigDecimal taskMileageRatio)
- {
- this.taskMileageRatio = taskMileageRatio;
+ public BigDecimal getTaskRatio() {
+ return taskRatio;
}
- public BigDecimal getTaskMileageRatio()
- {
- return taskMileageRatio;
- }
- public void setGpsCount(Integer gpsCount)
- {
- this.gpsCount = gpsCount;
+ public void setTaskRatio(BigDecimal taskRatio) {
+ this.taskRatio = taskRatio;
}
- public Integer getGpsCount()
- {
- return gpsCount;
+ public Integer getGpsPointCount() {
+ return gpsPointCount;
}
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("statsId", getStatsId())
- .append("vehicleId", getVehicleId())
- .append("statsDate", getStatsDate())
- .append("totalMileage", getTotalMileage())
- .append("taskMileage", getTaskMileage())
- .append("nonTaskMileage", getNonTaskMileage())
- .append("taskMileageRatio", getTaskMileageRatio())
- .append("gpsCount", getGpsCount())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .toString();
+ public void setGpsPointCount(Integer gpsPointCount) {
+ this.gpsPointCount = gpsPointCount;
+ }
+
+ public Integer getTaskCount() {
+ return taskCount;
+ }
+
+ public void setTaskCount(Integer taskCount) {
+ this.taskCount = taskCount;
}
}
--
Gitblit v1.9.1