diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index 392ea5d2..60f08f18 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -13,22 +13,23 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.kms.yg.cz.enmu.MonitorTypeEnum.*; import static com.shuili.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; @Getter public enum MonitorComposeEnum { - WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.SK_RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), - ENV(Collections.singletonList(MonitorTypeEnum.AIR_TEMPE), "气温", Collections.singletonList(MonitorTypeEnum.WATER_TEMPE), "水温"), - C_STRESS(Collections.singletonList(MonitorTypeEnum.STRESS), "压力", Collections.singletonList(MonitorTypeEnum.STRAIN), "应变"), - C_SEEPAGE_FLOW(Collections.singletonList(MonitorTypeEnum.SEEPAGE_FLOW), "渗流量", Collections.emptyList()), - C_DISPLACEMENT(Arrays.asList(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_SURFACE, MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_SURFACE, MonitorTypeEnum.VERTICAL_DISPLACEMENT), "位移量", Collections.emptyList()), - DF_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Collections.singletonList(MonitorTypeEnum.DF_WATER_LEVEL), "水位"), - SZ_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Arrays.asList(MonitorTypeEnum.WATER_LEVEL_ABOVE_GATE, MonitorTypeEnum.WATER_LEVEL_BELOW_GATE), "水位"), - SZ_SEEPAGE_AROUND(Collections.singletonList(MonitorTypeEnum.SEEPAGE_AROUND_DAM), "绕坝渗流", Collections.singletonList(MonitorTypeEnum.UPLIFTED_PRESSURE), "扬压力"), - SZ_DISPLACEMENT(Arrays.asList(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_INTERNAL, MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_INTERNAL, MonitorTypeEnum.VERTICAL_DISPLACEMENT_INTERNAL), "位移量", - Collections.singletonList(MonitorTypeEnum.CRACK_OPENING_DEGREE), "裂缝开合度"); + WATER_LEVEL(Collections.singletonList(SK_RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), + ENV(Collections.singletonList(AIR_TEMPE), "气温", Collections.singletonList(WATER_TEMPE), "水温"), + C_STRESS(Collections.singletonList(STRESS), "压力", Collections.singletonList(STRAIN), "应变"), + C_SEEPAGE_FLOW(Collections.singletonList(SEEPAGE_FLOW), "渗流量", Collections.emptyList()), + C_DISPLACEMENT(Arrays.asList(HORIZONTAL_DISPLACEMENT_X_SURFACE, HORIZONTAL_DISPLACEMENT_Y_SURFACE, VERTICAL_DISPLACEMENT), "位移量", Collections.emptyList()), + DF_WATER_LEVEL(Collections.singletonList(RAINFALL), "降雨量", Collections.singletonList(MonitorTypeEnum.DF_WATER_LEVEL), "水位"), + SZ_WATER_LEVEL(Collections.singletonList(RAINFALL), "降雨量", Collections.emptyList()), + SZ_SEEPAGE_AROUND(Collections.singletonList(GATE_FLOW_RATE), "过闸流量", + Arrays.asList(WATER_LEVEL_ABOVE_GATE,WATER_LEVEL_BELOW_GATE), "水位"), + SZ_DISPLACEMENT(Collections.singletonList(CRACK_OPENING_DEGREE), "裂缝开合度", Collections.emptyList()); private final List leftElements; private final String leftName;