From 520d3876a9d0a234f93f819016ace90783da05c1 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 16:26:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=A0=87=E7=BA=BF?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java | 2 +- .../src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java index 056863f3..ce426a48 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java +++ b/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), ; 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 537fa7de..f0205efa 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 @@ -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; }