Browse Source

feat: 完善标线逻辑

master_tdsql
hxh 4 months ago
parent
commit
520d3876a9
  1. 2
      shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java
  2. 5
      shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java

2
shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java

@ -15,7 +15,7 @@ import java.util.Map;
@Getter
public enum MarkTypeEnum {
FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "fsltdz", AttResRfkwlvMapper.class),
FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "rsltdz", AttResRfkwlvMapper.class),
CHFLLV("校准洪核水位", "m", Constants.DEFAULT_KEY_FIELD, "chfllv", AttResRsppMapper.class),
;

5
shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java

@ -106,6 +106,11 @@ public enum MonitorComposeEnum {
yAxis.add(right);
}
charInfoDto.setYAxis(yAxis);
charInfoDto.setMarkLine(Stream.concat(this.leftElements.stream(), this.rightElements.stream())
.map(MonitorTypeEnum::getMarkType)
.filter(Objects::nonNull)
.map(markType -> markType.toMarkLine(sp.getResCode()))
.collect(Collectors.toList()));
return charInfoDto;
}

Loading…
Cancel
Save