diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java index 08ea5f912..c1ecfcaf4 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java @@ -53,8 +53,6 @@ public final class BiReportSnapshotMapperSupport { public static WarehouseTransportSituationVO emptyWarehouseTransportSituation() { return WarehouseTransportSituationVO.builder() .warehouseDistributionOnTimeRate(0d) - .appointmentTime("") - .workFloor("") .currentYearOrders(0L) .currentQuarterOrders(0) .currentMonthOrders(0) @@ -82,6 +80,8 @@ public final class BiReportSnapshotMapperSupport { public static PlatformSurveillanceVO emptyPlatformSurveillance() { return PlatformSurveillanceVO.builder() + .appointmentTime("") + .workFloor("") .vehicles(Collections.emptyList()) .efficiencyStatistics(EfficiencyStatisticsVO.builder() .entryOvertimeRate(0).overtimeCount(0).platformOnTimeRate(0) diff --git a/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java b/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java index 2c4a3c24d..07cc92b52 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java +++ b/mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java @@ -97,8 +97,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder { } return WarehouseTransportSituationVO.builder() .warehouseDistributionOnTimeRate(jitterPercentDouble(Baseline.W_WH_RATE, r)) - .appointmentTime(Baseline.W_APPOINTMENT_TIME) - .workFloor(Baseline.W_WORK_FLOOR) .currentYearOrders(jitterLong(Baseline.W_YEAR_ORD, r)) .currentQuarterOrders(Math.max(0, jitterInt(Baseline.W_Q_ORD, r))) .currentMonthOrders(Math.max(0, jitterInt(Baseline.W_M_ORD, r))) @@ -215,6 +213,8 @@ public final class BiSnapshotWeeklyRandomDataBuilder { } return PlatformSurveillanceVO.builder() + .appointmentTime(Baseline.P_APPOINTMENT_TIME) + .workFloor(Baseline.P_WORK_FLOOR) .vehicles(vehicles) .efficiencyStatistics(eff) .platformOverview(overview) @@ -375,8 +375,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder { static final int[] COMP_INCOME_TREND = {195, 248, 302, 415, 366, 488}; static final double W_WH_RATE = 96.8; - static final String W_APPOINTMENT_TIME = "2026-08-03 09:30:00"; - static final String W_WORK_FLOOR = "一楼"; static final long W_YEAR_ORD = 612_800L; static final int W_Q_ORD = 198_600; static final int W_M_ORD = 28_440; @@ -398,6 +396,8 @@ public final class BiSnapshotWeeklyRandomDataBuilder { static final String[] W_CUST_NAMES = {"华东冷链", "华南汽配", "西南快消", "华北家电", "跨境达"}; static final int[] W_CUST_AMT = {198, 172, 205, 189, 221}; + static final String P_APPOINTMENT_TIME = "2026-08-03 09:30:00"; + static final String P_WORK_FLOOR = "一楼"; static final String[][] P_PLATES = { {"粤A12345", "待入场", "#12", "88"}, {"闽D99887", "作业中", "#07", "142"}, diff --git a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/WarehouseTransportSituationVO.java b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/WarehouseTransportSituationVO.java index 869dae950..01a6e8711 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/WarehouseTransportSituationVO.java +++ b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/WarehouseTransportSituationVO.java @@ -19,12 +19,6 @@ public class WarehouseTransportSituationVO { @ApiModelProperty("仓配衔接准时率,单位:%") private Double warehouseDistributionOnTimeRate; - @ApiModelProperty("预约申请时间") - private String appointmentTime; - - @ApiModelProperty("作业楼层") - private String workFloor; - @ApiModelProperty("本年度订单,单位:单") private Long currentYearOrders; diff --git a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformSurveillanceVO.java b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformSurveillanceVO.java index 0efd4039f..07ec3d657 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformSurveillanceVO.java +++ b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformSurveillanceVO.java @@ -16,6 +16,12 @@ import java.util.List; @ApiModel("月台监测指标") public class PlatformSurveillanceVO { + @ApiModelProperty("预约申请时间") + private String appointmentTime; + + @ApiModelProperty("作业楼层") + private String workFloor; + @ApiModelProperty("作业车辆状态列表") private List vehicles;