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 c1ecfcaf4..435c6108f 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 @@ -80,8 +80,6 @@ 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 07cc92b52..e34d40d82 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 @@ -127,6 +127,8 @@ public final class BiSnapshotWeeklyRandomDataBuilder { for (String[] row : Baseline.P_PLATES) { int dur = jitterInt(Integer.parseInt(row[3]), r); vehicles.add(PlatformVehicleItemVO.builder() + .appointmentTime(Baseline.P_APPOINTMENT_TIME) + .workFloor(Baseline.P_WORK_FLOOR) .plateNumber(row[0]) .status(row[1]) .platformId(row[2]) @@ -213,8 +215,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder { } return PlatformSurveillanceVO.builder() - .appointmentTime(Baseline.P_APPOINTMENT_TIME) - .workFloor(Baseline.P_WORK_FLOOR) .vehicles(vehicles) .efficiencyStatistics(eff) .platformOverview(overview) 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 07ec3d657..0efd4039f 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,12 +16,6 @@ import java.util.List; @ApiModel("月台监测指标") public class PlatformSurveillanceVO { - @ApiModelProperty("预约申请时间") - private String appointmentTime; - - @ApiModelProperty("作业楼层") - private String workFloor; - @ApiModelProperty("作业车辆状态列表") private List vehicles; diff --git a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java index 8ec4ebc49..f98561c13 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java +++ b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java @@ -14,6 +14,12 @@ import lombok.NoArgsConstructor; @ApiModel("月台监测-作业车辆") public class PlatformVehicleItemVO { + @ApiModelProperty("预约申请时间") + private String appointmentTime; + + @ApiModelProperty("作业楼层") + private String workFloor; + @ApiModelProperty("车牌号码") private String plateNumber;