From 592b601bd682a0bc12c6d5c8032a9d6ac4de8172 Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期二, 08 四月 2025 11:21:29 +0800
Subject: [PATCH] Merge pull request #48 from zhitan-cloud/develop1.0
---
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 9b32577..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,10 +1,10 @@
package com.zhitan.energyMonitor.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhitan.energyMonitor.domain.ElectricLoadEntity;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
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:
@@ -12,15 +12,17 @@
* @Date: 2022-04-19
* @Version: V1.0
*/
-public interface IElectricLoadService extends IService<ElectricLoadEntity> {
+public interface IElectricLoadService {
/**
* 鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
- *
- * @param timeType
- * @param timeCode
- * @param energyIndex
+ */
+ ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, String meterId);
+
+ /**
+ * 鑾峰彇鑺傜偣涓嬫墍鏈夌數琛�
+ * @param nodeId
* @return
*/
- ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, EnergyUnitToDevice energyUnitToDevice);
+ List<ListElectricityMeterVO> listElectricMeter(String nodeId);
}
--
Gitblit v1.9.3