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 fbaf9294..f8f5ac0f 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 @@ -18,7 +18,7 @@ public enum MarkTypeEnum implements MonitorIndexInfo { FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "fsltdz", AttResRfkwlvMapper.class), CHFLLV("校准洪核水位", "m", Constants.DEFAULT_KEY_FIELD, "chfllv", AttResRsppMapper.class), - NORM_WAT_LEV("正常蓄水位", "m", Constants.DEFAULT_KEY_FIELD, "normWatLev ", BsSgcSzSwtzMapper.class), + NORM_WAT_LEV("正常蓄水位", "m", Constants.DEFAULT_KEY_FIELD, "norm_wat_lev ", BsSgcSzSwtzMapper.class), DSFLLV("设计洪水位", "m", Constants.DEFAULT_KEY_FIELD, "dsfllv", BsSgcSzSwtzMapper.class); private final String zhName; 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..5dd9fcd1 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; @@ -126,7 +127,7 @@ public enum MonitorComposeEnum { return element.stream() .map(type -> { CharInfoDto.Series series = new CharInfoDto.Series(); - series.setName(name); + series.setName(type.getZhName()); MonitorSourceEnum source = type.getSource(); Map values = dataMap.get(source).stream() .map(map -> { diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java index 45be18d6..4d64ef0d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java @@ -95,7 +95,7 @@ public enum MonitorSourceEnum { if (this.type == MonitorTypeEnum.MONITOR) { MonitorResponse response = JSON.parseObject(json, MonitorResponse.class); if (!response.isSuccess()) { - log.error("record获取数据失败:{}", this.clazz); + log.error("record获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class); @@ -106,7 +106,7 @@ public enum MonitorSourceEnum { } else { DataResponse response = JSON.parseObject(json, DataResponse.class); if (!response.isSuccess()) { - log.error("data获取数据失败:{}", this.clazz); + log.error("data获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } MonitorQueDto queDto = resultWrapper.getQueDto(); @@ -136,7 +136,7 @@ public enum MonitorSourceEnum { private String data; public Boolean isSuccess() { - return "200".equals(getCode()); + return "0".equals(getCode()); } } 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 21d01269..62eadfd6 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 @@ -199,9 +199,9 @@ public class MonitorService { IPage page = source.getMockData(queDto); return (IPage) page; } - log.debug("请求接口:{}", dataSyncUrl + path); String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); + // log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); return (IPage) source.getRecords().apply(resultWrapper); } @@ -245,26 +245,25 @@ public class MonitorService { switch (operatorEnum) { case MAX: Optional v = getData(monitorTypeEnum, data).max(Comparator.comparingDouble(Double::doubleValue)); - v.ifPresent(aDouble -> item.setValue(aDouble.toString())); + v.ifPresent(aDouble -> item.setValue(String.format("%.2f", aDouble))); break; case MIN: Optional v1 = getData(monitorTypeEnum, data).min(Comparator.comparingDouble(Double::doubleValue)); - v1.ifPresent(aDouble -> item.setValue(aDouble.toString())); + v1.ifPresent(aDouble -> item.setValue(String.format("%.2f", aDouble))); break; case TOTAL: Optional v2 = getData(monitorTypeEnum, data).reduce(Double::sum); - v2.ifPresent(aDouble -> item.setValue(aDouble.toString())); + v2.ifPresent(aDouble -> item.setValue(String.format("%.2f", aDouble))); break; case TOP: Optional v3 = getData(monitorTypeEnum, data).limit(1).findFirst(); - v3.ifPresent(aDouble -> item.setValue(aDouble.toString())); + v3.ifPresent(aDouble -> item.setValue(String.format("%.2f", aDouble))); break; default: Optional v4 = getData(monitorTypeEnum, data).reduce(Double::sum); - v4.ifPresent(aDouble -> item.setValue((aDouble / data.size()) + "")); + v4.ifPresent(aDouble -> item.setValue(String.format("%.2f", aDouble / data.size()))); } - } catch (IllegalArgumentException e) { log.error("未找到对应的枚举值MonitorTypeEnum, key:{}", keys[2]); } @@ -272,7 +271,7 @@ public class MonitorService { private Stream getData(MonitorTypeEnum monitorTypeEnum, List> data) { return data.stream() - .map(map -> map.getOrDefault(monitorTypeEnum.getValueField(), "0.0").toString()) + .map(map -> map.getOrDefault(monitorTypeEnum.getValueField(), "0.00").toString()) .filter(StringUtils::isNotBlank) .map(Double::parseDouble); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java index 5e07eb8b..7b1b618c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java @@ -142,7 +142,7 @@ public class BsSgcSzSwtz extends BaseEntity private String wagaCode; - @TableField(value = "norm_wat_lev") + @TableField(value = "NORM_WAT_LEV") private String normWatLev; private String dslklv; private String dsfllv;