From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
index 1332be0..27320ef 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
@@ -4,6 +4,7 @@
import com.zhitan.common.core.domain.AjaxResult;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.EnergyIndexQuery;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import java.util.List;
@@ -103,7 +104,7 @@
List<EnergyIndex> searchIndexByNodeAndChildrenNode(String nodeId, String filter);
- void removeNodeIndex(List<String> removeLink);
+ void removeEnergyIndex(List<String> removeLink);
AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);
@@ -134,4 +135,11 @@
* @return
*/
List<EnergyIndex> listDeviceIndex(String nodeId, String meterId);
+
+ /**
+ * 鏍规嵁鐐逛綅id鑾峰彇妯″瀷鑺傜偣鐐逛綅淇℃伅
+ * @param indexIds
+ * @return
+ */
+ List<ModelNodeIndexInfo> getModelNodeIndexInfoListByIndexIds(String[] indexIds);
}
--
Gitblit v1.9.3