Browse Source

feat: 修改图标请求参数类型

master_tdsql
hxh 4 months ago
parent
commit
91a4455b6f
  1. 3
      shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java
  2. 6
      shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java
  3. 2
      shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

3
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.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yg.cz.enmu.MonitorComposeEnum;
import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -16,7 +15,7 @@ import java.util.Date;
public class MonitorQueDto { public class MonitorQueDto {
@ApiModelProperty(value = "监测要素") @ApiModelProperty(value = "监测要素")
private MonitorComposeEnum elementType; private String elementType;
@ApiModelProperty(value = "监测数据来源类型") @ApiModelProperty(value = "监测数据来源类型")
private MonitorSourceEnum monitorType; private MonitorSourceEnum monitorType;

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

@ -142,4 +142,10 @@ public enum MonitorComposeEnum {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
public static MonitorComposeEnum getEnum(String name) {
return Arrays.stream(MonitorComposeEnum.values())
.filter(item -> item.name().equals(name))
.findFirst()
.orElse(null);
}
} }

2
shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

@ -65,7 +65,7 @@ public class MonitorService {
public CharInfoDto chart(MonitorQueDto sp) { public CharInfoDto chart(MonitorQueDto sp) {
MonitorComposeEnum composeEnum = sp.getElementType(); MonitorComposeEnum composeEnum = MonitorComposeEnum.getEnum(sp.getElementType());
if (composeEnum == null) { if (composeEnum == null) {
return new CharInfoDto(); return new CharInfoDto();
} }

Loading…
Cancel
Save