From 55ff4ad6155248a7c2f391fd4fe75682a311dac0 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 16:54:26 +0800
Subject: [PATCH] refactor(svg): 优化 SVG相关组件功能
---
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 2d2e3b5..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
@@ -46,7 +46,7 @@
private MeterImplementMapper meterImplementMapper;
@Override
- public ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex) {
+ public ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, String meterId) {
ListElectricLoadVO vo = new ListElectricLoadVO();
List<ListElectricLoadItem> itemList = new ArrayList<>();
vo.setItemList(itemList);
@@ -59,7 +59,7 @@
detail.setRate(CommonConst.DOUBLE_MINUS_SIGN);
vo.setDetail(detail);
- MeterImplement meterImplement = meterImplementMapper.selectById(energyIndex.getMeterId());
+ MeterImplement meterImplement = meterImplementMapper.selectById(meterId);
if (ObjectUtil.isEmpty(meterImplement)) {
return vo;
@@ -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