Merge branch 'feature_gps'

wlzboy

2025-11-15 caf56217dc2bf898b63b0e1f31a7098202c32825

 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;
    }
}