From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 28c500a..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(String nodeId, List<String> removeLink);
+ void removeEnergyIndex(List<String> removeLink);
AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);
@@ -136,8 +137,9 @@
List<EnergyIndex> listDeviceIndex(String nodeId, String meterId);
/**
- * 閫氳繃id鍒犻櫎閲囬泦鐐�
+ * 鏍规嵁鐐逛綅id鑾峰彇妯″瀷鑺傜偣鐐逛綅淇℃伅
+ * @param indexIds
+ * @return
*/
- boolean deleteByIndexId(String indexId);
-
+ List<ModelNodeIndexInfo> getModelNodeIndexInfoListByIndexIds(String[] indexIds);
}
--
Gitblit v1.9.3