From cc52e21c310fc2dba49c24d7ed985b0aed1bb489 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 二月 2025 23:26:55 +0800
Subject: [PATCH] Merge branch 'master' into wt_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
index f3c4448..cfc6098 100644
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
+++ b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
@@ -1,7 +1,10 @@
package com.zhitan.energyMonitor.service;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadVO;
+import com.zhitan.energyMonitor.domain.vo.ListElectricityMeterVO;
import com.zhitan.model.domain.EnergyIndex;
+
+import java.util.List;
/**
* @Description:
@@ -14,5 +17,12 @@
/**
* 鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
*/
- ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex);
+ ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, String meterId);
+
+ /**
+ * 鑾峰彇鑺傜偣涓嬫墍鏈夌數琛�
+ * @param nodeId
+ * @return
+ */
+ List<ListElectricityMeterVO> listElectricMeter(String nodeId);
}
--
Gitblit v1.9.3