diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java index ef26f6d4..c7fa6c5b 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java @@ -2,7 +2,6 @@ package com.kms.yg.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.cz.enmu.MonitorComposeEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +15,7 @@ import java.util.Date; public class MonitorQueDto { @ApiModelProperty(value = "监测要素") - private MonitorComposeEnum elementType; + private String elementType; @ApiModelProperty(value = "监测数据来源类型") private MonitorSourceEnum monitorType; 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 f0205efa..40eea8ed 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 @@ -142,4 +142,10 @@ public enum MonitorComposeEnum { }).collect(Collectors.toList()); } + public static MonitorComposeEnum getEnum(String name) { + return Arrays.stream(MonitorComposeEnum.values()) + .filter(item -> item.name().equals(name)) + .findFirst() + .orElse(null); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 0b3fc65e..3507ba7e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -65,7 +65,7 @@ public class MonitorService { public CharInfoDto chart(MonitorQueDto sp) { - MonitorComposeEnum composeEnum = sp.getElementType(); + MonitorComposeEnum composeEnum = MonitorComposeEnum.getEnum(sp.getElementType()); if (composeEnum == null) { return new CharInfoDto(); }