Merge branch 'v5.5_driver_report_20231015' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -86,6 +86,12 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     ORDER_GOODS_WEIGHT_NOT_HAVE(1601, "货单可拉运吨数不足")
 
+
+    INTEGRAL_RULE_NO_FOUND(1700, "积分规则不存在"),
+    INTEGRAL_RULE_RATIO_OVERLAP(1701, "层级划分范围重叠"),
+    INTEGRAL_RULE_RATIO_ALL_EMPTY(1702, "层级划分范围不能全为空"),
+    INTEGRAL_RULE_NAME_EXIST(1703, "层级名称已存在"),
+
     ;
     private final int code;
     private final String msg;

performance-api/src/main/java/com/clx/performance/enums/collect/CollectLineReportEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectLineReportEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        SEND(1, "发货地"),
+        RECEIVE(2, "目的地");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    //1:无法到达货源地 2:无法装货 3：无法到达目的地  4：运单取消  5：装车卸车异常  6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报
+    @Getter
+    @AllArgsConstructor
+    public enum ReportType {
+        UNABLE_TO_SEND_ADDRESS(1, "无法到达货源地"),
+        UNABLE_LOAD(2, "无法装货"),
+        UNABLE_TO_RECEIVE_ADDRESS(3, "无法到达目的地"),
+        LOAD_UNLOAD(4, "装车卸车异常"),
+
+        NO_TAKE_ORDER(6, "没有接单"),
+        SEND_ADDRESS(7, "货源地情况"),
+
+        OTHER(8, "其它上报"),
+        QUALITY(9, "煤炭质量上报"),
+
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReportStatus {
+        NORMAL(1, "正常"),
+        ABNORMAL(2, "异常");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        UNAUDIT(0, "待审核"),
+        AUDIT(1, "已审核");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<AuditStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckLocationEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectTruckLocationEnum {
+    ;
+    private Integer truckOrderStatus;               //车辆出车状态 1:空车 2:重车
+    @Getter
+    @AllArgsConstructor
+    public enum TruckOrderStatus {
+        EMPTY(1, "空车"),
+        HEAVY(2, "重车"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<TruckOrderStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckWaitEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectTruckWaitEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReportType {
+        LOAD(1, "装车类型"),
+        UNLOAD(2, "卸车类型");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum waitType {
+        NO(1, "无需排队"),
+        INNER(2, "场内需要排队"),
+        OUTER(3, "厂外需要排队");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<waitType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        UNAUDIT(0, "待审核"),
+        AUDIT(1, "已审核");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<AuditStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralRecordEnum.java

+package com.clx.performance.enums.integral;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public enum IntegralRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type{
+        SYSTEM(1, "系统"),
+        PROTECTION(2, "保护分"),
+        PROTECTION_CANCEL(3, "保护分取消"),
+        SETTLEMENT(4, "结算分"),
+        BASE(5, "基础分"),
+
+        ORDER_CHILD_COMPLETE(11, "运单完成"),
+        ORDER_CHILD_COMPLETE_NUM(12, "运单完成数量"),
+        ORDER_CHILD_COMPLETE_WATER(13, "流水单"),
+        ORDER_CHILD_COMPLETE_SUPPORT(14, "支援单"),
+        ORDER_CHILD_COMPLETE_TIMEOUT(15, "运单完成超时"),
+
+        ORDER_CHILD_CANCEL(21, "运单取消"),
+        ORDER_CHILD_CANCEL_TIMEOUT(22, "运单取消超时"),
+        ORDER_CHILD_PLATFORM_CANCEL(23, "平台取消"),
+
+        REPORT_TRUCK_INFO(50, "提交基础信息"),
+        REPORT_REFUEL(51, "油表上报"),
+        REPORT_TRAFFIC(52, "上报交通拥堵"),
+        REPORT_SEND_ADDRESS_WAIT(53, "上报货源地需要排队"),
+        REPORT_SEND_ADDRESS_NO_WAIT(54, "上报货源地无需排队"),
+        REPORT_RECEIVE_ADDRESS_WAIT(55, "上报目的地需要排队"),
+        REPORT_RECEIVE_ADDRESS_NO_WAIT(56, "上报目的地无需排队"),
+        REPORT_QUALITY(57, "上报煤炭质量问题"),
+        REPORT_ABNORMAL(58, "上报拉运异常问题"),
+        ;
+
+        private Integer value;
+        private String msg;
+    }
+
+    // 取消
+    public static final List<Integer> DRIVER_REPORT_lIST = Arrays.asList(
+            Type.REPORT_TRUCK_INFO.value,
+            Type.REPORT_REFUEL.value,
+            Type.REPORT_TRAFFIC.value,
+            Type.REPORT_SEND_ADDRESS_WAIT.value,
+            Type.REPORT_SEND_ADDRESS_NO_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.value,
+            Type.REPORT_QUALITY.value,
+            Type.REPORT_ABNORMAL.value
+
+    );
+    // 取消
+    public static final List<Integer> PLATFORM_CANCEL_lIST = Arrays.asList(
+            Type.REPORT_TRUCK_INFO.value,
+            Type.REPORT_REFUEL.value,
+            Type.REPORT_TRAFFIC.value,
+            Type.REPORT_SEND_ADDRESS_WAIT.value,
+            Type.REPORT_SEND_ADDRESS_NO_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.value,
+            Type.REPORT_QUALITY.value,
+            Type.REPORT_ABNORMAL.value
+
+    );
+
+}

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralTruckRuleEnum.java

+package com.clx.performance.enums.integral;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum IntegralTruckRuleEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Status{
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectAutoLoanStatusUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectAutoLoanStatusUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "车贷状态：0无车贷 1有车贷", example = "")
+    private Integer autoLoanStatus;
+    @ApiModelProperty(value = "车贷剩余月份", example = "")
+    private Integer autoLoanMonth;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportAbnormalSaveParam {
+
+    @ApiModelProperty(value = "上报类型：1:无法到达货源地 2:无法装货 3：无法到达目的地  4装车卸车异常", example = "")
+    @NotNull(message = "上报类型不能为空")
+    private Integer reportType;
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达货源地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达货源地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportLoadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadUnloadAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportLoadUnloadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装卸车异常原因", example = "车辆问题")
+    @NotBlank(message = "无法到达装货地原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportNoTakeOrderAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportNoTakeOrderAbnormalSaveParam {
+
+    @ApiModelProperty(value = "货单编号")
+    @NotBlank(message = "货单不能为空")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "没有接单原因", example = "车辆问题")
+    @NotBlank(message = "没有接单原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportOtherSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportOtherSaveParam {
+
+    @ApiModelProperty(value = "上报信息")
+    @NotBlank(message = "上报信息不能为空")
+    private String remark;
+    @ApiModelProperty(value = "上报图片")
+    private List<String> imageList;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportQualitySaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportQualitySaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> imageList;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportReceiveAddressAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportReceiveAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达装货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达装货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportSendAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达货源地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达货源地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressSaveParam {
+
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "拉运状态：1可以拉运 2不可用拉运", example = "1")
+    @NotNull(message = "拉运状态不能为空")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "状态：1有存煤 2现产现装", example = "1")
+    private Integer status;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportTruckWaitAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportTruckWaitAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTrafficCongestionAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTrafficCongestionAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTrafficCongestionSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTrafficCongestionSaveParam {
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+
+    @ApiModelProperty(value = "预计拥堵时长（小时）", example = "1.5")
+    private BigDecimal jamTime;
+    @ApiModelProperty(value = "现场照片列表")
+    private List<String> jamImageList;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLeaveSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLeaveSaveParam {
+
+    @ApiModelProperty(value = "请假开始时间")
+    @NotBlank(message = "请假开始时间不能为空")
+    private String beginTime;
+    @ApiModelProperty(value = "请假结束时间")
+    @NotBlank(message = "请假结束时间不能为空")
+    private String endTime;
+    @ApiModelProperty(value = "请假原因")
+    @NotBlank(message = "请假原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLocationSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLocationSaveParam {
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "1")
+    @NotNull(message = "车辆出车状态不能空")
+    private Integer truckOrderStatus;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+    @ApiModelProperty(value = "司机手填地址", example = "北京路1号")
+    private String locationRemark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckRefuelSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckRefuelSaveParam {
+
+    @ApiModelProperty(value = "运单编号", example = "10000000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装车油表图片列表")
+    @NotEmpty(message = "装车油表图片不能为空")
+    private List<String> loadImageList;
+    @ApiModelProperty(value = "卸车油表图片列表")
+    @NotEmpty(message = "卸车油表图片不能为空")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "装车油量", example = "1.23")
+    private BigDecimal loadOil;
+    @ApiModelProperty(value = "卸车油量", example = "1.23")
+    private BigDecimal unloadOil;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceLineMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceLineMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "单次任务接受最远距离（公里）", example = "")
+    private Integer distanceLineMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceSendAddressMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceSendAddressMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "接受距货源地最远距离（公里）", example = "")
+    private Integer distanceSendAddressMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceUsualPlaceMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceUsualPlaceMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "接受距常驻地最远距离（公里）", example = "")
+    private Integer distanceUsualPlaceMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportGoodsTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportGoodsTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "拉运货物意愿：1块煤 2面煤 3煤泥", example = "")
+    private String goodsType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportOverTonnageTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportOverTonnageTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "拉运方式：1标吨 2超吨 3白天标吨晚上超吨", example = "")
+    private Integer overTonnageType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportParkAddressUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportParkAddressUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆停放位置", example = "")
+    private String parkAddress;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckUnloadTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckUnloadTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "卸车类型：1自卸侧翻 2自卸立翻 3非自卸", example = "")
+    private Integer unloadType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportReceiveAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectWaitReportReceiveAddressSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "排队状态：1 无需排队 2 场内需要排队 3 厂外需要排队", example = "1")
+    @NotNull(message = "排队状态不能为空")
+    private Integer waitType;
+
+    @ApiModelProperty(value = "预计站外等待时长", example = "1")
+    private BigDecimal stationOutTime;
+    @ApiModelProperty(value = "预计站外等待时长图片列表")
+    private List<String> stationOutImageList;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportSendAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectWaitReportSendAddressSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "排队状态：1 无需排队 2 场内需要排队 3 厂外需要排队", example = "1")
+    @NotNull(message = "排队状态不能为空")
+    private Integer waitType;
+
+    @ApiModelProperty(value = "预计站内等待时长", example = "1")
+    private BigDecimal stationInTime;
+    @ApiModelProperty(value = "预计站内等待时长图片列表")
+    private List<String> stationInImageList;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectLineReportParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectLineReportParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTraficCongestionParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTraficCongestionParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLeaveParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckLeaveParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLocationParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckLocationParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckRefuelParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckRefuelParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckWaitParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckWaitParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectAbnormalReportParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectAbnormalReportParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "发货地", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地", example = "")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "异常类型：1:无法到达货源地 2:无法装货 3：无法到达目的地  4：运单取消  5：装车卸车异常", example = "1")
+    private Integer reportType;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectNoTakeOrderReportParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectNoTakeOrderReportParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "发货地", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地", example = "")
+    private String receiveAddress;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectOtherReportParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectOtherReportParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectQualityReportParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectQualityReportParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核")
+    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectSendAddressReportParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectSendAddressReportParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "是否可拉运：1可以拉运 2不可用拉运", example = "1")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "货源地", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核")
+    private Integer auditStatus;
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectTraficCongestionParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectTraficCongestionParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "拥堵位置", example = "")
+    private String address;
+
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectTruckLeaveParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectTruckLeaveParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "请假开始时间范围")
+    private String beginTime1;
+    @ApiModelProperty(value = "请假开始时间范围")
+    private String endTime1;
+
+    @ApiModelProperty(value = "请假结束时间范围")
+    private String beginTime2;
+    @ApiModelProperty(value = "请假结束时间范围")
+    private String endTime2;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectTruckLocationParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectTruckLocationParam extends PageParam {
+
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2:重车", example = "")
+    private Integer truckOrderStatus;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectTruckRefuelParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectTruckRefuelParam extends PageParam {
+
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "发货地", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地", example = "")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/CarrierPageCollectTruckWaitParam.java

+package com.clx.performance.param.pc.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CarrierPageCollectTruckWaitParam extends PageParam {
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "联系方式", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "排队地点", example = "")
+    private String address;
+    @ApiModelProperty(value = "排队类型：1 货源地排队 2目的地排队", example = "")
+    private Integer reportType;
+    @ApiModelProperty(value = "是否排队：1 无需排队 2 场内需要排队 3 厂外需要排队", example = "")
+    private Integer waitType;
+
+    @ApiModelProperty(value = "上报开始时间")
+    private String beginTime;
+    @ApiModelProperty(value = "上报结束时间")
+    private String endTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核")
+    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralRuleUpdateParam.java

+package com.clx.performance.param.pc.integral;
+
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.Valid;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增积分
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class IntegralRuleUpdateParam {
+
+    @Valid
+    @ApiModelProperty(value = "运单完成积分规则")
+    private AppIntegralRuleVO.OrderChildCompleteRule orderChildCompleteRule;
+
+    @Valid
+    @ApiModelProperty(value = "货单奖励积分规则")
+    private AppIntegralRuleVO.OrderAwardRule orderAwardRule;
+
+    @Valid
+    @ApiModelProperty(value = "货单扣减积分规则")
+    private AppIntegralRuleVO.OrderChildCancelRule orderDiscountRule;
+
+    @Valid
+    @ApiModelProperty(value = "运单超时扣减规则")
+    private AppIntegralRuleVO.OrderChildTimeoutRule orderChildTimeoutRule;
+
+    @Valid
+    @ApiModelProperty(value = "平台补偿积分规则")
+    private AppIntegralRuleVO.PlatformCompensationRule platformCompensationRule;
+
+    @Valid
+    @ApiModelProperty(value = "司机上报积分规则")
+    private AppIntegralRuleVO.DriverReportRule driverReportRule;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleSaveParam.java

+package com.clx.performance.param.pc.integral;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增积分
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class IntegralTruckRuleSaveParam {
+
+    @ApiModelProperty(value = "层级名称", example = "")
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    @ApiModelProperty(value = "积分起始范围", example = "")
+    private Integer integralRatioBegin;
+    @ApiModelProperty(value = "积分结束范围", example = "")
+    private Integer integralRatioEnd;
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    private Integer status;
+    @ApiModelProperty(value = "预期收益开始范围（分）", example = "")
+    private BigDecimal incomeBegin;
+    @ApiModelProperty(value = "预期收益结束范围（分）", example = "")
+    private BigDecimal incomeEnd;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleStatusDeleteParam.java

+package com.clx.performance.param.pc.integral;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增积分
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class IntegralTruckRuleStatusDeleteParam {
+
+    @ApiModelProperty(value = "id", example = "")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleStatusUpdateParam.java

+package com.clx.performance.param.pc.integral;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增积分
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class IntegralTruckRuleStatusUpdateParam {
+
+    @ApiModelProperty(value = "id", example = "")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleUpdateParam.java

+package com.clx.performance.param.pc.integral;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增积分
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class IntegralTruckRuleUpdateParam {
+
+    @ApiModelProperty(value = "id", example = "")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+    @ApiModelProperty(value = "层级名称", example = "")
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    @ApiModelProperty(value = "积分起始范围", example = "")
+    private Integer integralRatioBegin;
+    @ApiModelProperty(value = "积分结束范围", example = "")
+    private Integer integralRatioEnd;
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    private Integer status;
+    @ApiModelProperty(value = "预期收益开始范围（分）", example = "")
+    private BigDecimal incomeBegin;
+    @ApiModelProperty(value = "预期收益结束范围（分）", example = "")
+    private BigDecimal incomeEnd;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/integral/PageIntegralTruckRuleParam.java

+package com.clx.performance.param.pc.integral;
+
+import com.msl.common.base.PageParam;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageIntegralTruckRuleParam extends PageParam {
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/collect/AppCollectTruckVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+* @Author: aiqinguo
+* @Description: 车辆信息上报
+* @Date: 2023/11/07 11:11:41
+* @Version: 1.0
+*/
+
+@ApiModel(description = "车辆信息上报")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class AppCollectTruckVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "车辆id", example = "")
+    private Integer truckId;
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "卸车类型：1自卸侧翻 2自卸立翻 3非自卸", example = "")
+    private Integer unloadType;
+    @ApiModelProperty(value = "车贷状态：0无车贷 1有车贷", example = "")
+    private Integer autoLoanStatus;
+    @ApiModelProperty(value = "车贷剩余月份", example = "")
+    private Integer autoLoanMonth;
+    @ApiModelProperty(value = "车辆停放位置", example = "")
+    private String parkAddress;
+    @ApiModelProperty(value = "拉运方式：1标吨 2超吨 3白天标吨晚上超吨", example = "")
+    private Integer overTunageType;
+    @ApiModelProperty(value = "接受距常驻地最远距离（公里）", example = "")
+    private Integer distanceUsualPlaceMax;
+    @ApiModelProperty(value = "单次任务接受最远距离（公里）", example = "")
+    private Integer distanceLineMax;
+    @ApiModelProperty(value = "接受距货源地最远距离（公里）", example = "")
+    private Integer distanceSendAddressMax;
+    @ApiModelProperty(value = "拉运货物意愿：1块煤 2面煤 3煤泥", example = "")
+    private String goodsType;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildLoadMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description:
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OrderChildLoadMqParam {
+
+    private String childNo;        //运单编号
+
+}

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildUnloadMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description:
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OrderChildUnloadMqParam {
+
+    private String childNo;        //运单编号
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectLineReportVO.java

+package com.clx.performance.vo.pc.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.enums.collect.CollectLineReportEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Author: aiqinguo
+* @Description: 线路信息上报
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "线路信息上报")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectLineReportVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "货单单编号", example = "")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "发货地址id", example = "")
+    private Integer sendAddressId;
+    @ApiModelProperty(value = "发货地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址id", example = "")
+    private Integer receiveAddressId;
+    @ApiModelProperty(value = "收货地址", example = "")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "类型：1 发货地 2 目的地", example = "")
+    private Integer type;
+    @ApiModelProperty(value = "上报类型（1~4异常上报）：1:无法到达货源地 2:无法装货 3：无法到达目的地  4：装车卸车异常    6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报", example = "")
+    private Integer reportType;
+    @ApiModelProperty(value = "上报类型（1~4异常上报）：1:无法到达货源地 2:无法装货 3：无法到达目的地  4：装车卸车异常    6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报", example = "")
+    private String reportTypeMsg;
+    public String getReportTypeMsg() {
+        return CollectLineReportEnum.ReportType.getByCode(reportType).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "拉运状态 1: 正常 2：异常", example = "")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "拉运状态 1: 正常 2：异常", example = "")
+    private String reportStatusMsg;
+    public String getReportStatusMsg() {
+        return CollectLineReportEnum.ReportStatus.getByCode(reportStatus).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "状态描述", example = "")
+    private String remark;
+    @ApiModelProperty(value = "上报图片", example = "", hidden = true)
+    private String image;
+    @ApiModelProperty(value = "上报图片")
+    private List<String> imageList;
+    public List<String> getImageList() {
+        return StringUtils.isEmpty(image)? new ArrayList<>() : JSON.parseArray(image, String.class);
+    }
+
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private Integer auditStatus;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private String auditStatusMsg;
+    public String getAuditStatusMsg() {
+        return CollectLineReportEnum.AuditStatus.getByCode(auditStatus).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTrafficCongestionVO.java

+package com.clx.performance.vo.pc.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.enums.collect.CollectLineReportEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Author: aiqinguo
+* @Description: 道路拥堵情况
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "道路拥堵情况")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTrafficCongestionVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "经度", example = "")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度", example = "")
+    private BigDecimal latitude;
+    @ApiModelProperty(value = "预计拥堵时长", example = "")
+    private BigDecimal jamTime;
+    @ApiModelProperty(value = "现场照片", example = "", hidden = true)
+    private String jamImage;
+    @ApiModelProperty(value = "现场照片", example = "")
+    private List<String> jamImageList;
+    public List<String> getJamImageList() {
+        return StringUtils.isEmpty(jamImage)? new ArrayList<>() : JSON.parseArray(jamImage, String.class);
+    }
+
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private Integer auditStatus;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private String auditStatusMsg;
+    public String getAuditStatusMsg() {
+        return CollectLineReportEnum.AuditStatus.getByCode(auditStatus).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckLeaveVO.java

+package com.clx.performance.vo.pc.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 司机请假表
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "司机请假表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckLeaveVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "请假开始时间", example = "")
+    private String beginTime;
+    @ApiModelProperty(value = "请假结束时间", example = "")
+    private String endTime;
+    @ApiModelProperty(value = "请假原因", example = "")
+    private String remark;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckLocationVO.java

+package com.clx.performance.vo.pc.collect;
+
+import com.clx.performance.enums.collect.CollectTruckLocationEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 车辆位置上报
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "车辆位置上报")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckLocationVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+//    @ApiModelProperty(value = "省", example = "")
+//    private String province;
+//    @ApiModelProperty(value = "市", example = "")
+//    private String city;
+//    @ApiModelProperty(value = "区县", example = "")
+//    private String county;
+//    @ApiModelProperty(value = "乡镇", example = "")
+//    private String town;
+//    @ApiModelProperty(value = "街道", example = "")
+//    private String street;
+//    @ApiModelProperty(value = "详细地址", example = "")
+//    private String address;
+    @ApiModelProperty(value = "全地址", example = "")
+    private String fullAddress;
+
+    @ApiModelProperty(value = "经度", example = "")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度", example = "")
+    private BigDecimal latitude;
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "", hidden = true)
+    private Integer truckOrderStatus;
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "")
+    private String truckOrderStatusMsg;
+    public String getTruckOrderStatusMsg() {
+        return CollectTruckLocationEnum.TruckOrderStatus.getByCode(truckOrderStatus).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckRefuelVO.java

+package com.clx.performance.vo.pc.collect;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Author: aiqinguo
+* @Description: 油表上报信息
+* @Date: 2023/10/16 13:06:27
+* @Version: 1.0
+*/
+
+@ApiModel(description = "油表上报信息")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckRefuelVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "发货地址id", example = "")
+    private Integer sendAddressId;
+    @ApiModelProperty(value = "发货地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址id", example = "")
+    private Integer receiveAddressId;
+    @ApiModelProperty(value = "收货地址", example = "")
+    private String receiveAddress;
+    @ApiModelProperty(value = "装车油表", example = "", hidden = true)
+    private String loadImage;
+    @ApiModelProperty(value = "装车油表list集合", example = "")
+    private List<String> loadImageList;
+    public List<String> getLoadImageList() {
+        return StringUtils.isEmpty(loadImage)? new ArrayList<>() : JSON.parseArray(loadImage, String.class);
+    }
+
+    @ApiModelProperty(value = "装车油量", example = "")
+    private BigDecimal loadOil;
+    @ApiModelProperty(value = "卸车油表集合", example = "", hidden = true)
+    private String unloadImage;
+    @ApiModelProperty(value = "装车油表list集合", example = "")
+    private List<String> unloadImageList;
+    public List<String> getUnloadImageList() {
+        return StringUtils.isEmpty(unloadImage)? new ArrayList<>() : JSON.parseArray(unloadImage, String.class);
+    }
+
+    @ApiModelProperty(value = "卸车油量", example = "")
+    private BigDecimal unloadOil;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckWaitVO.java

+package com.clx.performance.vo.pc.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.enums.collect.CollectTruckWaitEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Author: aiqinguo
+* @Description: 线路排队耗时
+* @Date: 2023/10/16 13:06:27
+* @Version: 1.0
+*/
+
+@ApiModel(description = "线路排队耗时")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckWaitVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "地址id", example = "")
+    private Integer addressId;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "上报类型：1 装车类型 2卸车类型", example = "")
+    private Integer reportType;
+
+    @ApiModelProperty(value = "上报类型：1 装车类型 2卸车类型", example = "")
+    private String reportTypeMsg;
+    public String getReportTypeMsg() {
+        return CollectTruckWaitEnum.ReportType.getByCode(reportType).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "上报类型：1 需要排队 ", example = "")
+    private Integer waitType;
+    @ApiModelProperty(value = "上报类型：1 需要排队 ", example = "")
+    private String waitTypeMsg;
+    public String getWaitTypeMsg() {
+        return CollectTruckWaitEnum.waitType.getByCode(waitType).get().getMsg();
+    }
+
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站内等待时长", example = "", hidden = true)
+    private BigDecimal stationInTime;
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站内等待时长图片", example = "", hidden = true)
+    private String stationInImage;
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站外等待时长", example = "", hidden = true)
+    private BigDecimal stationOutTime;
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站外等待时长图片", example = "", hidden = true)
+    private String stationOutImage;
+
+    @ApiModelProperty(value = "预计等待时长", example = "")
+    private BigDecimal stationTime;
+    public BigDecimal getStationTime() {
+        return stationInTime;
+    }
+
+    @ApiModelProperty(value = "预计等待时长图片", example = "")
+    private List<String> stationImageList;
+    public List<String> getStationImageList() {
+        return StringUtils.isEmpty(stationOutImage)? new ArrayList<>() : JSON.parseArray(stationInImage, String.class);
+    }
+
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private Integer auditStatus;
+    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")
+    private String auditStatusMsg;
+    public String getAuditStatusMsg() {
+        return CollectTruckWaitEnum.AuditStatus.getByCode(auditStatus).get().getMsg();
+    }
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralRuleVO.java

+package com.clx.performance.vo.pc.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 车辆积分规则
+* @Date: 2023/11/06 14:12:53
+* @Version: 1.0
+*/
+
+@ApiModel(description = "积分规则")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class AppIntegralRuleVO {
+
+    @ApiModelProperty(value = "运单完成积分规则")
+    private OrderChildCompleteRule orderChildCompleteRule;
+    @ApiModelProperty(value = "货单奖励积分规则")
+    private OrderAwardRule orderAwardRule;
+    @ApiModelProperty(value = "货单扣减积分规则")
+    private OrderChildCancelRule orderChildCancelRule;
+    @ApiModelProperty(value = "运单超时扣减规则")
+    private OrderChildTimeoutRule orderChildTimeoutRule;
+    @ApiModelProperty(value = "平台补偿积分规则")
+    private PlatformCompensationRule platformCompensationRule;
+    @ApiModelProperty(value = "司机上报积分规则")
+    private DriverReportRule driverReportRule;
+
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderChildCompleteRule{
+        @ApiModelProperty(value = "当日完成第1笔运单积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integer1;
+        @ApiModelProperty(value = "当日完成第2笔运单积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integer2;
+        @ApiModelProperty(value = "当日完成第3笔运单积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integer3;
+        @ApiModelProperty(value = "当日完成第4笔运单积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integer4;
+    }
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderAwardRule{
+        @ApiModelProperty(value = "完成流水单每单附加积分x")
+        private Integer integerWater;
+        @ApiModelProperty(value = "当日流水单奖励次数上限x")
+        private Integer countWaterLimit;
+        @ApiModelProperty(value = "完成支援单每单附加积分x")
+        private Integer integerSupport;
+        @ApiModelProperty(value = "当日支援单奖励次数上限x")
+        private Integer countSupportLimit;
+    }
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderChildCancelRule {
+        @ApiModelProperty(value = "自行取消运单每单扣减积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integralCancel;
+        @ApiModelProperty(value = "自行取消流水单每单另扣积分x")
+        private Integer integralWaterCancel;
+        @ApiModelProperty(value = "自行取消支援单每单另扣积分x")
+        private Integer integralSupportCancel;
+    }
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderChildTimeoutRule{
+        @ApiModelProperty(value = "超时未到达货源地扣积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integralSendAddressTimeout;
+        @ApiModelProperty(value = "超时未到达目的地扣积分x")
+        @NotNull(message = "参数不能为空")
+        private Integer integralReceiveAddressTimeout;
+        @ApiModelProperty(value = "接单超时扣积分x")
+        private Integer integralTakeOrderTimeout;
+    }
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class PlatformCompensationRule{
+        @ApiModelProperty(value = "平台取消运单补偿积分x")
+        private Integer integralCancel;
+        @ApiModelProperty(value = "当日平台补偿积分上限x")
+        private Integer integralCancelLimit;
+        @ApiModelProperty(value = "规定时间不能装车补偿x")
+        private Integer integralLoad;
+        @ApiModelProperty(value = "规定时间不能卸车补偿x")
+        private Integer integralUnload;
+    }
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class DriverReportRule{
+        @ApiModelProperty(value = "提交基础信息每项积分x")
+        private Integer integralTruck;
+        @ApiModelProperty(value = "油表上报积分x")
+        private Integer integralRefuel;
+        @ApiModelProperty(value = "上报交通拥堵积分x")
+        private Integer integralTraffic;
+        @ApiModelProperty(value = "上报货源地需要排队积分x")
+        private Integer integralSendAddressWait;
+        @ApiModelProperty(value = "上报货源地无需排队积分x")
+        private Integer integralSendAddressNoWait;
+        @ApiModelProperty(value = "上报目的地需要排队积分x")
+        private Integer integralReceiveAddressWait;
+        @ApiModelProperty(value = "上报目的地无需排队积分x")
+        private Integer integralReceiveAddressNoWait;
+        @ApiModelProperty(value = "上报煤炭质量问题积分x")
+        private Integer integralQuality;
+        @ApiModelProperty(value = "上报拉运异常问题积分x")
+        private Integer integralAbnormal;
+        @ApiModelProperty(value = "限制频繁上报奖励间隔x(小时)")
+        private BigDecimal reportLimit;
+        @ApiModelProperty(value = "当日上报奖励积分上限x")
+        private Integer integralLimit;
+    }
+
+
+    @ApiModelProperty(value = "运单完成积分规则", example = "", hidden = true)
+    private OrderChildCompleteRule orderChildCompleteRuleJson;
+    @ApiModelProperty(value = "货单奖励积分规则", example = "", hidden = true)
+    private OrderAwardRule orderAwardRuleJson;
+    @ApiModelProperty(value = "货单扣减积分规则", example = "", hidden = true)
+    private OrderChildCancelRule orderDiscountRuleJson;
+    @ApiModelProperty(value = "运单超时扣减规则", example = "", hidden = true)
+    private OrderChildTimeoutRule orderChildTimeoutRuleJson;
+    @ApiModelProperty(value = "平台补偿积分规则", example = "", hidden = true)
+    private PlatformCompensationRule platformCompensationRuleJson;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralTruckRuleVO.java

+package com.clx.performance.vo.pc.integral;
+
+import com.clx.performance.enums.integral.IntegralTruckRuleEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 车辆积分规则
+* @Date: 2023/11/06 14:12:53
+* @Version: 1.0
+*/
+
+@ApiModel(description = "车辆积分规则")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class AppIntegralTruckRuleVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "层级名称", example = "")
+    private String name;
+    @ApiModelProperty(value = "积分起始范围", example = "")
+    private Integer integralRatioBegin;
+    @ApiModelProperty(value = "积分结束范围", example = "")
+    private Integer integralRatioEnd;
+
+    @ApiModelProperty(value = "积分结束范围", example = "")
+    private String integralRatioMsg;
+    public String getIntegralRatioMsg() {
+        if (integralRatioBegin == null && integralRatioEnd !=null) {return "积分小于"+integralRatioEnd+"%";}
+        if (integralRatioEnd == null && integralRatioBegin !=null) {return "积分大于"+integralRatioBegin+"%";}
+        return "积分"+ integralRatioBegin+"%" + "—" + integralRatioEnd+"%";
+    }
+
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    private Integer status;
+
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    private String statusMsg;
+    public String getStatusMsg() {
+        return IntegralTruckRuleEnum.Status.getByCode(status).get().getMsg();
+    }
+
+    @ApiModelProperty(value = "预期收益开始范围（分）", example = "")
+    private BigDecimal incomeBegin;
+    @ApiModelProperty(value = "预期收益结束范围（分）", example = "")
+    private BigDecimal incomeEnd;
+
+    @ApiModelProperty(value = "预期收益结束范围", example = "")
+    private String incomeMsg;
+    public String getIncomeMsg() {
+        if (incomeBegin == null && incomeEnd !=null) {return "日收益小于等于"+incomeEnd.toString()+"元";}
+        if (incomeEnd == null && incomeBegin !=null) {return "日收益大于等于"+incomeBegin.toString()+"元";}
+        return "日收益"+ incomeBegin.toString() + "元—" + incomeBegin.toString()+"元";
+    }
+
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/config/RabbitOrderChildConfig.java

@@ -108,5 +108,28 @@ public class RabbitOrderChildConfig {
     public Binding orderChildCancelQueueBinding() {
         return BindingBuilder.bind(orderChildCancelQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_CANCEL_ROUTING_KEY);
     }
+    /**
+     * 装车
+     */
+    @Bean
+    public Queue orderChildLoadQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_LOAD_QUEUE);
+    }
+    @Bean
+    public Binding orderChildLoadQueueBinding() {
+        return BindingBuilder.bind(orderChildLoadQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_LOAD_ROUTING_KEY);
+    }
+
+    /**
+     * 卸车
+     */
+    @Bean
+    public Queue orderChildUnloadQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_UNLOAD_QUEUE);
+    }
+    @Bean
+    public Binding orderChildUnloadQueueBinding() {
+        return BindingBuilder.bind(orderChildUnloadQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_UNLOAD_ROUTING_KEY);
+    }
 
 }

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyOrderChildConstants.java

@@ -69,4 +69,16 @@ public class RabbitKeyOrderChildConstants {
     public static final String ORDER_CHILD_CANCEL_QUEUE = PREFIX +"orderChild.cancel"+QUEUE;
     public static final String ORDER_CHILD_CANCEL_ROUTING_KEY = PREFIX +"orderChild.cancel"+QUEUE_ROUTING_KEY;
 
+    /**
+     * 装车
+     */
+    public static final String ORDER_CHILD_LOAD_QUEUE = PREFIX +"orderChild.load"+QUEUE;
+    public static final String ORDER_CHILD_LOAD_ROUTING_KEY = PREFIX +"orderChild.load"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 卸车
+     */
+    public static final String ORDER_CHILD_UNLOAD_QUEUE = PREFIX +"orderChild.unload"+QUEUE;
+    public static final String ORDER_CHILD_UNLOAD_ROUTING_KEY = PREFIX +"orderChild.unload"+QUEUE_ROUTING_KEY;
+
 }

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectLineReportController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.*;
+import com.clx.performance.service.collect.CollectLineReportService;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/line")
+@Validated
+@Api(tags = "APP-线路上报")
+@AllArgsConstructor
+public class AppDriverCollectLineReportController {
+
+    private final CollectLineReportService collectLineReportService;
+
+    @ApiOperation(value = "上报货源地情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveSendAddressReport")
+    public Result<Void> saveSendAddressReport(@RequestBody @Validated CollectLineReportSendAddressSaveParam param) {
+        collectLineReportService.saveSendAddressReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "上报异常", notes = "<br>By:艾庆国")
+    @PostMapping("/saveAbnormalReport")
+    public Result<Void> saveAbnormalReport(@RequestBody @Validated CollectLineReportAbnormalSaveParam param) {
+        collectLineReportService.saveAbnormalReport(param);
+
+        return Result.ok();
+    }
+
+    @Deprecated
+    @ApiOperation(value = "上报异常无法到达货源地", notes = "<br>By:艾庆国")
+    @PostMapping("/saveSendAddressAbnormalReport")
+    public Result<Void> saveSendAddressAbnormalReport(@RequestBody @Validated CollectLineReportSendAddressAbnormalSaveParam param) {
+        collectLineReportService.saveSendAddressAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @Deprecated
+    @ApiOperation(value = "上报异常无法装货", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLoadAbnormalReport")
+    public Result<Void> saveLoadAbnormalReport(@RequestBody @Validated CollectLineReportLoadAbnormalSaveParam param) {
+        collectLineReportService.saveLoadAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @Deprecated
+    @ApiOperation(value = "上报异常无法到达目的地", notes = "<br>By:艾庆国")
+    @PostMapping("/saveReceiveAddressAbnormalReport")
+    public Result<Void> saveReceiveAddressAbnormalReport(@RequestBody @Validated CollectLineReportReceiveAddressAbnormalSaveParam param) {
+        collectLineReportService.saveReceiveAddressAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @Deprecated
+    @ApiOperation(value = "上报装卸车异常", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLoadUnloadAbnormalReport")
+    public Result<Void> saveLoadUnloadAbnormalReport(@RequestBody @Validated CollectLineReportLoadUnloadAbnormalSaveParam param) {
+        collectLineReportService.saveLoadUnloadAbnormalReport(param);
+
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "上报异常没有接单原因", notes = "<br>By:艾庆国")
+    @PostMapping("/saveNoTakeOrderAbnormalReport")
+    public Result<Void> saveNoTakeOrderAbnormalReport(@RequestBody @Validated CollectLineReportNoTakeOrderAbnormalSaveParam param) {
+        collectLineReportService.saveNoTakeOrderAbnormalReport(param);
+
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "上报其它情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveOtherReport")
+    public Result<Void> saveOtherReport(@RequestBody @Validated CollectLineReportOtherSaveParam param) {
+        collectLineReportService.saveOtherReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "上报煤炭质量", notes = "<br>By:艾庆国")
+    @PostMapping("/saveQualityReport")
+    public Result<Void> saveQualityReport(@RequestBody @Validated CollectLineReportQualitySaveParam param) {
+        collectLineReportService.saveQualityReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询线路上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectLineReportVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectLineReportService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询线路上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLineReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectLineReportVO>> pageLineReport(@RequestBody @Validated PageCollectLineReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.pageLineReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTrafficCongestionController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.service.collect.CollectTrafficCongestionService;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/traffic")
+@Validated
+@Api(tags = "APP-交通上报")
+@AllArgsConstructor
+public class AppDriverCollectTrafficCongestionController {
+
+    private final CollectTrafficCongestionService collectTrafficCongestionService;
+
+    @ApiOperation(value = "上报交通", notes = "<br>By:艾庆国")
+    @PostMapping("/saveTrafficReport")
+    public Result<Void> saveTrafficReport(@RequestBody @Validated CollectTrafficCongestionSaveParam param) {
+        collectTrafficCongestionService.saveTrafficReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询交通上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTrafficCongestionVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTrafficCongestionService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询交通上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageTrafficReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTrafficCongestionVO>> pageTrafficReport(@RequestBody @Validated PageCollectTraficCongestionParam param) {
+        IPage<CollectTrafficCongestionVO> page = collectTrafficCongestionService.pageTrafficReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckController.java

+package com.clx.performance.controller.app;
+
+import com.clx.performance.param.app.collect.*;
+import com.clx.performance.service.collect.CollectTruckService;
+import com.clx.performance.vo.app.collect.AppCollectTruckVO;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/truck")
+@Validated
+@Api(tags = "APP-车辆上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckController {
+
+    private final CollectTruckService collectTruckService;
+
+    @ApiOperation(value = "更新卸车方式", notes = "<br>By:艾庆国")
+    @PostMapping("/updateUnloadType")
+    public Result<Void> updateUnloadType(@RequestBody @Validated CollectTruckUnloadTypeUpdateParam param) {
+        collectTruckService.updateUnloadType(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新车贷情况", notes = "<br>By:艾庆国")
+    @PostMapping("/updateAutoLoanStatus")
+    public Result<Void> updateAutoLoanStatus(@RequestBody @Validated CollectAutoLoanStatusUpdateParam param) {
+        collectTruckService.updateAutoLoanStatus(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新车辆停放位置", notes = "<br>By:艾庆国")
+    @PostMapping("/updateParkAddress")
+    public Result<Void> updateParkAddress(@RequestBody @Validated CollectTruckReportParkAddressUpdateParam param) {
+        collectTruckService.updateParkAddress(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新拉运方式", notes = "<br>By:艾庆国")
+    @PostMapping("/updateOverTonnageType")
+    public Result<Void> updateOverTonnageType(@RequestBody @Validated CollectTruckReportOverTonnageTypeUpdateParam param) {
+        collectTruckService.updateOverTonnageType(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新接受距常驻地最远距离", notes = "<br>By:艾庆国")
+    @PostMapping("/updateUsualPlaceDistanceMax")
+    public Result<Void> updateDistanceUsualPlaceMax(@RequestBody @Validated CollectTruckReportDistanceUsualPlaceMaxUpdateParam param) {
+        collectTruckService.updateDistanceUsualPlaceMax(param);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "更新单次任务接受最远距离", notes = "<br>By:艾庆国")
+    @PostMapping("/updateLineDistanceMax")
+    public Result<Void> updateDistanceLineMax(@RequestBody @Validated CollectTruckReportDistanceLineMaxUpdateParam param) {
+        collectTruckService.updateDistanceLineMax(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新接受距货源地最远距离", notes = "<br>By:艾庆国")
+    @PostMapping("/updateSendAddressDistanceMax")
+    public Result<Void> updateDistanceSendAddressMax(@RequestBody @Validated CollectTruckReportDistanceSendAddressMaxUpdateParam param) {
+        collectTruckService.updateDistanceSendAddressMax(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新拉运货物意愿", notes = "<br>By:艾庆国")
+    @PostMapping("/updateGoodsType")
+    public Result<Void> updateGoodsType(@RequestBody @Validated CollectTruckReportGoodsTypeUpdateParam param) {
+        collectTruckService.updateGoodsType(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询车辆详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<AppCollectTruckVO> getReportInfo(@Validated @NotBlank(message = "车牌不能为空") String truckNo) {
+
+        return Result.ok(collectTruckService.getReportInfo(truckNo));
+
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLeaveController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.service.collect.CollectTruckLeaveService;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/leave")
+@Validated
+@Api(tags = "APP-请假")
+@AllArgsConstructor
+public class AppDriverCollectTruckLeaveController {
+
+    private final CollectTruckLeaveService collectTruckLeaveService;
+
+    @ApiOperation(value = "新增请假", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLeave")
+    public Result<Void> saveLeave(@RequestBody @Validated CollectTruckLeaveSaveParam param) {
+        collectTruckLeaveService.saveLeave(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询请假详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getInfo")
+    public Result<CollectTruckLeaveVO> getInfo(Integer id) {
+
+        return Result.ok(collectTruckLeaveService.getInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询请假列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLeave")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckLeaveVO>> pageLeave(@RequestBody @Validated PageCollectTruckLeaveParam param) {
+        IPage<CollectTruckLeaveVO> page = collectTruckLeaveService.pageLeave(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLocationController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.service.collect.CollectTruckLocationService;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/location")
+@Validated
+@Api(tags = "APP-位置上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckLocationController {
+
+    private final CollectTruckLocationService collectTruckLocationService;
+
+    @ApiOperation(value = "上报位置", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLocationReport")
+    public Result<Void> saveLocationReport(@RequestBody @Validated CollectTruckLocationSaveParam param) {
+        collectTruckLocationService.saveLocationReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询位置上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTruckLocationVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTruckLocationService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询位置上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLocationReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckLocationVO>> pageLocationReport(@RequestBody @Validated PageCollectTruckLocationParam param) {
+        IPage<CollectTruckLocationVO> page = collectTruckLocationService.pageLocationReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckRefuelController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.service.collect.CollectTruckRefuelService;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/refuel")
+@Validated
+@Api(tags = "APP-油表上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckRefuelController {
+
+    private final CollectTruckRefuelService collectTruckRefuelService;
+
+    @ApiOperation(value = "上报油表", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRefuelReport")
+    public Result<Void> saveRefuelReport(@RequestBody @Validated CollectTruckRefuelSaveParam param) {
+        collectTruckRefuelService.saveRefuelReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询油表上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTruckRefuelVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTruckRefuelService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询油表上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRefuelReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckRefuelVO>> pageRefuelReport(@RequestBody @Validated PageCollectTruckRefuelParam param) {
+        IPage<CollectTruckRefuelVO> page = collectTruckRefuelService.pageRefuelReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckWaitController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSaveParam;
+import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
+import com.clx.performance.service.collect.CollectWaitReportService;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/wait")
+@Validated
+@Api(tags = "APP-排队上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckWaitController {
+
+    private final CollectWaitReportService collectWaitReportService;
+
+    @ApiOperation(value = "上报装货地排队情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveSendAddressReport")
+    public Result<Void> saveSendAddressReport(@RequestBody @Validated CollectWaitReportSendAddressSaveParam param) {
+        collectWaitReportService.saveSendAddressReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "上报卸车地排队情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveReceiveAddressReport")
+    public Result<Void> saveReceiveAddressReport(@RequestBody @Validated CollectWaitReportReceiveAddressSaveParam param) {
+        collectWaitReportService.saveReceiveAddressReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询线路上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTruckWaitVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectWaitReportService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询排队上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageWaitReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckWaitVO>> pageWaitReport(@RequestBody @Validated PageCollectTruckWaitParam param) {
+        IPage<CollectTruckWaitVO> page = collectWaitReportService.pageWaitReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectLineReportController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.*;
+import com.clx.performance.param.pc.carrier.*;
+import com.clx.performance.service.collect.CollectLineReportService;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/line")
+@Validated
+@Api(tags = "承运PC-线路上报")
+@AllArgsConstructor
+public class CarrierDriverCollectLineReportController {
+
+    private final CollectLineReportService collectLineReportService;
+
+    @ApiOperation(value = "分页查询货源地上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageSendAddressReport")
+    public Result<PageData<CollectLineReportVO>> pageSendAddressReport(@RequestBody @Validated CarrierPageCollectSendAddressReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.carrierPageSendAddressReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "货源地上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateSendAddressReportAudit")
+    public Result<Void> updateSendAddressReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
+        collectLineReportService.updateSendAddressReportAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询异常上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageAbnormalReport")
+    public Result<PageData<CollectLineReportVO>> pageAbnormalReport(@RequestBody @Validated CarrierPageCollectAbnormalReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.carrierPageAbnormalReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+    @ApiOperation(value = "异常上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateAbnormalReportAudit")
+    public Result<Void> updateAbnormalReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
+        collectLineReportService.updateAbnormalReportAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询无接单上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageNoTakeOrderReport")
+    public Result<PageData<CollectLineReportVO>> pageNoTakeOrderReport(@RequestBody @Validated CarrierPageCollectNoTakeOrderReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.carrierPageNoTakeOrderReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+    @ApiOperation(value = "无接单上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateNoTakeOrderReportAudit")
+    public Result<Void> updateNoTakeOrderReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
+        collectLineReportService.updateNoTakeOrderReportAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询煤炭质量上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageQualityReport")
+    public Result<PageData<CollectLineReportVO>> pageQualityReport(@RequestBody @Validated CarrierPageCollectQualityReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.carrierPageQualityReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+    @ApiOperation(value = "煤炭质量上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateQualityReportAudit")
+    public Result<Void> updateQualityReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
+        collectLineReportService.updateQualityReportAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询其它上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageOtherReport")
+    public Result<PageData<CollectLineReportVO>> pageOtherReport(@RequestBody @Validated CarrierPageCollectOtherReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.carrierPageOtherReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTrafficCongestionController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
+import com.clx.performance.service.collect.CollectTrafficCongestionService;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/traffic")
+@Validated
+@Api(tags = "承运PC-交通上报")
+@AllArgsConstructor
+public class CarrierDriverCollectTrafficCongestionController {
+
+    private final CollectTrafficCongestionService collectTrafficCongestionService;
+
+    @ApiOperation(value = "交通上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateTrafficCongestionAudit")
+    public Result<Void> updateTrafficCongestionAudit(@RequestBody @Validated CollectTrafficCongestionAuditParam param) {
+        collectTrafficCongestionService.updateTrafficCongestionAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询交通上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageTrafficReport")
+    public Result<PageData<CollectTrafficCongestionVO>> pageTrafficReport(@RequestBody @Validated CarrierPageCollectTraficCongestionParam param) {
+        IPage<CollectTrafficCongestionVO> page = collectTrafficCongestionService.carrierPageTrafficReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckLeaveController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
+import com.clx.performance.service.collect.CollectTruckLeaveService;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/leave")
+@Validated
+@Api(tags = "承运PC-请假")
+@AllArgsConstructor
+public class CarrierDriverCollectTruckLeaveController {
+
+    private final CollectTruckLeaveService collectTruckLeaveService;
+
+    @ApiOperation(value = "分页查询请假列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLeave")
+    public Result<PageData<CollectTruckLeaveVO>> pageLeave(@RequestBody @Validated CarrierPageCollectTruckLeaveParam param) {
+        IPage<CollectTruckLeaveVO> page = collectTruckLeaveService.carrierPageLeave(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckLocationController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
+import com.clx.performance.service.collect.CollectTruckLocationService;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/location")
+@Validated
+@Api(tags = "承运PC-位置上报")
+@AllArgsConstructor
+public class CarrierDriverCollectTruckLocationController {
+
+    private final CollectTruckLocationService collectTruckLocationService;
+
+    @ApiOperation(value = "分页查询司机位置上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLocationReport")
+    public Result<PageData<CollectTruckLocationVO>> pageLocationReport(@RequestBody @Validated CarrierPageCollectTruckLocationParam param) {
+        IPage<CollectTruckLocationVO> page = collectTruckLocationService.carrierPageLocationReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckRefuelController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
+import com.clx.performance.service.collect.CollectTruckRefuelService;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/refuel")
+@Validated
+@Api(tags = "承运PC-油表上报")
+@AllArgsConstructor
+public class CarrierDriverCollectTruckRefuelController {
+
+    private final CollectTruckRefuelService collectTruckRefuelService;
+
+    @ApiOperation(value = "分页查询油表上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRefuelReport")
+    public Result<PageData<CollectTruckRefuelVO>> pageRefuelReport(@RequestBody @Validated CarrierPageCollectTruckRefuelParam param) {
+        IPage<CollectTruckRefuelVO> page = collectTruckRefuelService.carrierPageRefuelReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckWaitController.java

+package com.clx.performance.controller.pc.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.*;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
+import com.clx.performance.service.collect.CollectWaitReportService;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/driver/collect/wait")
+@Validated
+@Api(tags = "承运PC-排队上报")
+@AllArgsConstructor
+public class CarrierDriverCollectTruckWaitController {
+
+    private final CollectWaitReportService collectWaitReportService;
+
+    @ApiOperation(value = "排队上报审核", notes = "<br>By:艾庆国")
+    @PostMapping("/updateWaitReportAudit")
+    public Result<Void> updateWaitReportAudit(@RequestBody @Validated CollectLineReportTruckWaitAuditParam param) {
+        collectWaitReportService.updateWaitReportAudit(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页查询排队上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageWaitReport")
+    public Result<PageData<CollectTruckWaitVO>> pageWaitReport(@RequestBody @Validated CarrierPageCollectTruckWaitParam param) {
+        IPage<CollectTruckWaitVO> page = collectWaitReportService.carrierPageWaitReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/integral/IntegralRuleController.java

+package com.clx.performance.controller.pc.integral;
+
+import com.clx.performance.param.pc.integral.IntegralRuleUpdateParam;
+import com.clx.performance.service.integral.IntegralRuleService;
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/integral/rule")
+@Validated
+@Api(tags = "承运端-积分规则")
+@AllArgsConstructor
+public class IntegralRuleController {
+
+    @Autowired
+    private IntegralRuleService integralRuleService;
+
+    @ApiOperation(value = "更新积分规则", notes = "<br>By:艾庆国")
+    @PostMapping("/updateRule")
+    @UnitCovert
+    public Result<Void> updateRule(@RequestBody @Validated IntegralRuleUpdateParam param) {
+        integralRuleService.updateRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询积分规则信息", notes = "<br>By:艾庆国")
+    @GetMapping(value = "getRuleInfo")
+    @UnitCovert(param = false)
+    public Result<AppIntegralRuleVO> getRuleInfo() {
+
+        return Result.ok(integralRuleService.getRuleInfo());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/integral/IntegralTruckRuleController.java

+package com.clx.performance.controller.pc.integral;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.param.pc.integral.*;
+import com.clx.performance.service.integral.IntegralTruckRuleService;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/integral/truck/rule")
+@Validated
+@Api(tags = "承运端-车辆规则")
+@AllArgsConstructor
+public class IntegralTruckRuleController {
+
+    @Autowired
+    private IntegralTruckRuleService integralTruckRuleService;
+
+
+    @ApiOperation(value = "新增车辆层级配置", notes = "<br>By:艾庆国")
+    @PostMapping(value = "addRule")
+    @UnitCovert
+    public Result<Void> addRule(@RequestBody @Validated IntegralTruckRuleSaveParam param) {
+        if (param.getIntegralRatioBegin() == null && param.getIntegralRatioEnd()==null){
+            throw new ServiceSystemException(PerformanceResultEnum.INTEGRAL_RULE_RATIO_ALL_EMPTY);
+        }
+
+        integralTruckRuleService.addRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新车辆层级配置", notes = "<br>By:艾庆国")
+    @PostMapping("/updateRule")
+    @UnitCovert
+    public Result<Void> updateRule(@RequestBody @Validated IntegralTruckRuleUpdateParam param) {
+        integralTruckRuleService.updateRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新车辆层级配置状态", notes = "<br>By:艾庆国")
+    @PostMapping("/updateRuleStatus")
+    public Result<Void> updateRuleStatus(@RequestBody @Validated IntegralTruckRuleStatusUpdateParam param) {
+        integralTruckRuleService.updateRuleStatus(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "删除车辆层级配置", notes = "<br>By:艾庆国")
+    @PostMapping("/deleteRule")
+    public Result<Void> deleteRule(@RequestBody @Validated IntegralTruckRuleStatusDeleteParam param) {
+        integralTruckRuleService.deleteRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询车辆层级配置信息", notes = "<br>By:艾庆国")
+    @GetMapping(value = "getRuleInfo")
+    @UnitCovert(param = false)
+    public Result<AppIntegralTruckRuleVO> getRuleInfo(@Validated @NotNull(message = "id不能为空") Integer id) {
+
+        return Result.ok(integralTruckRuleService.getRuleInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询车辆层级配置列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRule")
+    @UnitCovert(param = false)
+    public Result<PageData<AppIntegralTruckRuleVO>> pageRule(@RequestBody @Validated PageIntegralTruckRuleParam param) {
+        IPage<AppIntegralTruckRuleVO> page = integralTruckRuleService.pageRule(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/IntegralRecordDao.java

@@ -8,6 +8,8 @@ import com.clx.performance.vo.pc.IntegralRecordVO;
 import com.msl.common.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 积分记录
@@ -21,10 +23,15 @@ public interface IntegralRecordDao extends BaseDao<IntegraRecordMapper, Integral
     Integer sumIntegral(@Param("statisticsId") Integer statisticsId);
 
     IntegralRecord selectByStatisticsIdAndType(@Param("statisticsId") Integer statisticsId, @Param("type") Integer type);
+    int sumByStatisticsIdAndTypes(@Param("statisticsId") Integer statisticsId, @Param("list") List<Integer> typeList);
 
     Integer sumByStatisticsIdAndTypeAndTime(@Param("statisticsId") Integer statisticsId,
                                             @Param("type") Integer type,
                                             @Param("beginTime")String beginTime,
                                             @Param("endTime")String endTime);
+    Integer countByStatisticsIdAndTypeAndTime(@Param("statisticsId") Integer statisticsId,
+                                            @Param("type") Integer type,
+                                            @Param("beginTime")String beginTime,
+                                            @Param("endTime")String endTime);
 
 }

performance-web/src/main/java/com/clx/performance/dao/collect/CollectLineReportDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectLineReportMapper;
+import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.param.pc.carrier.*;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 线路信息上报
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectLineReportDao extends BaseDao<CollectLineReportMapper, CollectLineReport, Integer> {
+    boolean updateAuditStatus(CollectLineReport item);
+
+    IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param);
+    IPage<CollectLineReportVO> carrierPageSendAddressReport(CarrierPageCollectSendAddressReportParam param);
+    IPage<CollectLineReportVO> carrierPageAbnormalReport(CarrierPageCollectAbnormalReportParam param);
+    IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(CarrierPageCollectNoTakeOrderReportParam param);
+    IPage<CollectLineReportVO> carrierPageQualityReport(CarrierPageCollectQualityReportParam param);
+    IPage<CollectLineReportVO> carrierPageOtherReport(CarrierPageCollectOtherReportParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTrafficCongestionDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
+import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 道路拥堵情况
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTrafficCongestionDao extends BaseDao<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> {
+    boolean updateAuditStatus(CollectTrafficCongestion item);
+
+    IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param);
+    IPage<CollectTrafficCongestionVO> carrierPageTraffic(CarrierPageCollectTraficCongestionParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckDao.java

+package com.clx.performance.dao.collect;
+
+import com.clx.performance.mapper.collect.CollectTruckMapper;
+import com.clx.performance.model.collect.CollectTruck;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 线路排队耗时
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTruckDao extends BaseDao<CollectTruckMapper, CollectTruck, Integer> {
+
+    boolean update(CollectTruck item);
+
+    Optional<CollectTruck> getByUserNoAndTruckNo(Long userNo, String truckNo);
+
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLeaveDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
+import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 司机请假表
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTruckLeaveDao extends BaseDao<CollectTruckLeaveMapper, CollectTruckLeave, Integer> {
+
+    IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param);
+    IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLocationDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
+import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 车辆位置上报
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTruckLocationDao extends BaseDao<CollectTruckLocationMapper, CollectTruckLocation, Integer> {
+
+    IPage<CollectTruckLocationVO> pageLocation(PageCollectTruckLocationParam param);
+
+    IPage<CollectTruckLocationVO> carrierPageLocation(CarrierPageCollectTruckLocationParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckRefuelDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 油表上报信息
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTruckRefuelDao extends BaseDao<CollectTruckRefuelMapper, CollectTruckRefuel, Integer> {
+
+    IPage<CollectTruckRefuelVO> pageRefuel(PageCollectTruckRefuelParam param);
+    IPage<CollectTruckRefuelVO> carrierPageRefuel(CarrierPageCollectTruckRefuelParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckWaitDao.java

+package com.clx.performance.dao.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
+import com.clx.performance.model.collect.CollectTruckWait;
+import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 线路排队耗时
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface CollectTruckWaitDao extends BaseDao<CollectTruckWaitMapper, CollectTruckWait, Integer> {
+    boolean updateAuditStatus(CollectTruckWait item);
+
+    IPage<CollectTruckWaitVO> pageWaitReport(PageCollectTruckWaitParam param);
+    IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/IntegralRecordDaoImpl.java

@@ -11,6 +11,8 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 /**
  * @Author: aiqinguo
@@ -37,7 +39,14 @@ public class IntegralRecordDaoImpl extends BaseDaoImpl<IntegraRecordMapper, Inte
     public IntegralRecord selectByStatisticsIdAndType(Integer statisticsId, Integer type) {
         return getOne(lQrWrapper()
                 .eq(IntegralRecord::getStatisticsId, statisticsId)
-                .eq(IntegralRecord::getType, type));
+                .eq(IntegralRecord::getType, type)
+                .orderByDesc(IntegralRecord::getCreateTime)
+        );
+    }
+
+    @Override
+    public int sumByStatisticsIdAndTypes(Integer statisticsId, List<Integer> typeList) {
+        return baseMapper.sumByStatisticsIdAndTypes(statisticsId, typeList);
     }
 
     @Override
@@ -45,4 +54,10 @@ public class IntegralRecordDaoImpl extends BaseDaoImpl<IntegraRecordMapper, Inte
         return baseMapper.sumByStatisticsIdAndTypeAndTime(statisticsId, type, beginTime, endTime);
     }
 
+    @Override
+    public Integer countByStatisticsIdAndTypeAndTime(Integer statisticsId, Integer type, String beginTime, String endTime) {
+        return baseMapper.countByStatisticsIdAndTypeAndTime(statisticsId, type, beginTime, endTime);
+
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectLineReportDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectLineReportDao;
+import com.clx.performance.mapper.collect.CollectLineReportMapper;
+import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.param.pc.carrier.*;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 线路信息上报
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectLineReportDaoImpl extends BaseDaoImpl<CollectLineReportMapper, CollectLineReport, Integer> implements CollectLineReportDao {
+
+    @Override
+    public boolean updateAuditStatus(CollectLineReport item) {
+        return update(lUdWrapper()
+                .eq(CollectLineReport::getId, item.getId())
+                .set(CollectLineReport::getAuditStatus, item.getAuditStatus())
+        );
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLineReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> carrierPageSendAddressReport(CarrierPageCollectSendAddressReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageSendAddressReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> carrierPageAbnormalReport(CarrierPageCollectAbnormalReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageAbnormalReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(CarrierPageCollectNoTakeOrderReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageNoTakeOrderReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> carrierPageQualityReport(CarrierPageCollectQualityReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageQualityReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> carrierPageOtherReport(CarrierPageCollectOtherReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageOtherReport(page,param);
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTrafficCongestionDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
+import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
+import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 道路拥堵情况
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTrafficCongestionDaoImpl extends BaseDaoImpl<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> implements CollectTrafficCongestionDao {
+
+    @Override
+    public boolean updateAuditStatus(CollectTrafficCongestion item) {
+        return update(lUdWrapper()
+                .eq(CollectTrafficCongestion::getId, item.getId())
+                .set(CollectTrafficCongestion::getAuditStatus, item.getAuditStatus())
+        );
+    }
+
+    @Override
+    public IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param) {
+        Page<CollectTrafficCongestionVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageTraffic(page,param);
+    }
+
+    @Override
+    public IPage<CollectTrafficCongestionVO> carrierPageTraffic(CarrierPageCollectTraficCongestionParam param) {
+        Page<CollectTrafficCongestionVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageTraffic(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.clx.performance.dao.collect.CollectTruckDao;
+import com.clx.performance.mapper.collect.CollectTruckMapper;
+import com.clx.performance.model.collect.CollectTruck;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 车辆信息上报
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTruckDaoImpl extends BaseDaoImpl<CollectTruckMapper, CollectTruck, Integer> implements CollectTruckDao {
+
+    @Override
+    public boolean update(CollectTruck item) {
+        return update(lUdWrapper()
+                .eq(CollectTruck::getId, item.getId())
+                .set(CollectTruck::getUnloadType, item.getUnloadType())
+                .set(CollectTruck::getAutoLoanStatus, item.getAutoLoanStatus())
+                .set(CollectTruck::getAutoLoanMonth, item.getAutoLoanMonth())
+                .set(CollectTruck::getParkAddress, item.getParkAddress())
+                .set(CollectTruck::getOverTonnageType, item.getOverTonnageType())
+                .set(CollectTruck::getDistanceUsualPlaceMax, item.getDistanceUsualPlaceMax())
+                .set(CollectTruck::getDistanceLineMax, item.getDistanceLineMax())
+                .set(CollectTruck::getDistanceSendAddressMax, item.getDistanceSendAddressMax())
+                .set(CollectTruck::getGoodsType, item.getGoodsType())
+        );
+    }
+
+    @Override
+    public Optional<CollectTruck> getByUserNoAndTruckNo(Long userNo, String truckNo) {
+        return Optional.of(truckNo)
+                .map(item -> lQrWrapper()
+                        .eq(CollectTruck::getTruckNo, truckNo)
+                        .eq(CollectTruck::getUserNo, userNo)
+                )
+                .map(super::getOne);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLeaveDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectTruckLeaveDao;
+import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
+import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 司机请假表
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTruckLeaveDaoImpl extends BaseDaoImpl<CollectTruckLeaveMapper, CollectTruckLeave, Integer> implements CollectTruckLeaveDao {
+
+    @Override
+    public IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param) {
+        Page<CollectTruckLeaveVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLeave(page,param);
+    }
+
+    @Override
+    public IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param) {
+        Page<CollectTruckLeaveVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageLeave(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLocationDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectTruckLocationDao;
+import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
+import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 车辆位置上报
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTruckLocationDaoImpl extends BaseDaoImpl<CollectTruckLocationMapper, CollectTruckLocation, Integer> implements CollectTruckLocationDao {
+
+    @Override
+    public IPage<CollectTruckLocationVO> pageLocation(PageCollectTruckLocationParam param) {
+        Page<CollectTruckLocationVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLocation(page,param);
+    }
+
+    @Override
+    public IPage<CollectTruckLocationVO> carrierPageLocation(CarrierPageCollectTruckLocationParam param) {
+        Page<CollectTruckLocationVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageLocation(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckRefuelDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectTruckRefuelDao;
+import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 油表上报信息
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTruckRefuelDaoImpl extends BaseDaoImpl<CollectTruckRefuelMapper, CollectTruckRefuel, Integer> implements CollectTruckRefuelDao {
+
+    @Override
+    public IPage<CollectTruckRefuelVO> pageRefuel(PageCollectTruckRefuelParam param) {
+        Page<CollectTruckRefuelVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageRefuel(page,param);
+    }
+
+    @Override
+    public IPage<CollectTruckRefuelVO> carrierPageRefuel(CarrierPageCollectTruckRefuelParam param) {
+        Page<CollectTruckRefuelVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageRefuel(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckWaitDaoImpl.java

+package com.clx.performance.dao.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.collect.CollectTruckWaitDao;
+import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
+import com.clx.performance.model.collect.CollectTruckWait;
+import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
+import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 线路排队耗时
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class CollectTruckWaitDaoImpl extends BaseDaoImpl<CollectTruckWaitMapper, CollectTruckWait, Integer> implements CollectTruckWaitDao {
+
+    @Override
+    public boolean updateAuditStatus(CollectTruckWait item) {
+        return update(lUdWrapper()
+                .eq(CollectTruckWait::getId, item.getId())
+                .set(CollectTruckWait::getAuditStatus, item.getAuditStatus())
+        );
+    }
+
+    @Override
+    public IPage<CollectTruckWaitVO> pageWaitReport(PageCollectTruckWaitParam param) {
+        Page<CollectTruckWaitVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageWaitReport(page,param);
+    }
+
+    @Override
+    public IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param) {
+        Page<CollectTruckWaitVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.carrierPageWaitReport(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/integral/IntegralRuleDaoImpl.java

+package com.clx.performance.dao.impl.integral;
+
+import com.clx.performance.dao.integral.IntegralRuleDao;
+import com.clx.performance.mapper.integral.IntegralRuleMapper;
+import com.clx.performance.model.integral.IntegralRule;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 积分规则
+ * @Date: 2023-10-9 12:00:54
+ * @Version: 1.0
+ */
+@Repository
+public class IntegralRuleDaoImpl extends BaseDaoImpl<IntegralRuleMapper, IntegralRule, Integer> implements IntegralRuleDao {
+
+    @Override
+    public boolean update(IntegralRule item) {
+        return update(lUdWrapper()
+                .eq(IntegralRule::getId, item.getId())
+                .set(IntegralRule::getOrderChildCompleteRuleJson, item.getOrderChildCompleteRuleJson())
+                .set(IntegralRule::getOrderAwardRuleJson, item.getOrderAwardRuleJson())
+                .set(IntegralRule::getOrderDiscountRuleJson, item.getOrderDiscountRuleJson())
+                .set(IntegralRule::getOrderChildTimeoutRuleJson, item.getOrderChildTimeoutRuleJson())
+                .set(IntegralRule::getPlatformCompensationRuleJson, item.getPlatformCompensationRuleJson())
+                .set(IntegralRule::getDriverReportRuleJson, item.getDriverReportRuleJson())
+        );
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/integral/IntegralTruckRuleDaoImpl.java

+package com.clx.performance.dao.impl.integral;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.integral.IntegralTruckRuleDao;
+import com.clx.performance.mapper.integral.IntegralTruckRuleMapper;
+import com.clx.performance.model.integral.IntegralTruckRule;
+import com.clx.performance.param.pc.integral.PageIntegralTruckRuleParam;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 积分车辆规则
+ * @Date: 2023-10-9 12:00:54
+ * @Version: 1.0
+ */
+@Repository
+public class IntegralTruckRuleDaoImpl extends BaseDaoImpl<IntegralTruckRuleMapper, IntegralTruckRule, Integer> implements IntegralTruckRuleDao {
+
+    @Override
+    public boolean update(IntegralTruckRule item) {
+        return update(lUdWrapper()
+                .eq(IntegralTruckRule::getId, item.getId())
+                .set(IntegralTruckRule::getStatus, item.getStatus())
+                .set(IntegralTruckRule::getName, item.getName())
+                .set(IntegralTruckRule::getIntegralRatioBegin, item.getIntegralRatioBegin())
+                .set(IntegralTruckRule::getIntegralRatioEnd, item.getIntegralRatioEnd())
+                .set(IntegralTruckRule::getIncomeBegin, item.getIncomeBegin())
+                .set(IntegralTruckRule::getIncomeEnd, item.getIncomeEnd())
+        );
+    }
+
+    @Override
+    public boolean updateStatus(IntegralTruckRule item) {
+        return update(lUdWrapper()
+                .eq(IntegralTruckRule::getId, item.getId())
+                .set(IntegralTruckRule::getStatus, item.getStatus())
+        );
+    }
+
+    @Override
+    public List<IntegralTruckRule> listAllRule() {
+        return list(lQrWrapper().orderByAsc(IntegralTruckRule::getIntegralRatioBegin));
+    }
+
+    @Override
+    public IPage<AppIntegralTruckRuleVO> pageRule(PageIntegralTruckRuleParam param) {
+        Page<AppIntegralTruckRuleVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageRule(page,param);
+    }
+}