From 6c139c6657094a896d6bfb40844df2882f592b60 Mon Sep 17 00:00:00 2001 From: ali <ali9696@163.com> Date: 星期一, 24 二月 2025 15:00:35 +0800 Subject: [PATCH] 统计指标库功能链接修改为设置为通过URL拼接的方式获取模型 --- zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java index 6db0d80..2e47b66 100644 --- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java @@ -127,6 +127,7 @@ List<TagValue> minList = new ArrayList<>(); List<TagValue> avgList = new ArrayList<>(); if (TimeTypeConst.TIME_TYPE_DAY.equals(timeType)) { + } else { String tempTimeCode = StringUtil.ifEmptyOrNullReturnValue(timeCode).replace(CommonConst.SINGLE_MINUS_SIGN, CommonConst.EMPTY); Date start = DateTimeUtil.toDateTime(tempTimeCode, DateTimeUtil.COMMON_PATTERN_MONTH); @@ -233,13 +234,13 @@ TagValue rt3 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.max); TagValue rt4 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.min); TagValue rt2 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.mean); - if (ObjectUtils.isNotEmpty(rt2.getValue())) { + if (ObjectUtils.isNotEmpty(rt2)) { temp.setAvg(String.valueOf(DoubleUtil.formatDouble(rt2.getValue()))); } - if (ObjectUtils.isNotEmpty(rt3.getValue())) { + if (ObjectUtils.isNotEmpty(rt3)) { temp.setMax(String.valueOf(DoubleUtil.formatDouble(rt3.getValue()))); } - if (ObjectUtils.isNotEmpty(rt4.getValue())) { + if (ObjectUtils.isNotEmpty(rt4)) { temp.setMin(String.valueOf(DoubleUtil.formatDouble(rt4.getValue()))); } } -- Gitblit v1.9.3