From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001
From: net <net@netdeMBP.lan>
Date: 星期五, 14 二月 2025 17:25:21 +0800
Subject: [PATCH] 合并理去杀杀人
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
index 301d0ae..c519c97 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
@@ -84,7 +84,6 @@
/**
* 鏌ヨ鎸囨爣淇℃伅鍒楄〃
*
- * @param energyIndex 鎸囨爣淇℃伅
* @return 鎸囨爣淇℃伅
*/
@Override
@@ -346,9 +345,20 @@
* @return
*/
public List<EnergyIndex> listDeviceIndexByCode(String nodeId, String meterId, String indexCode) {
- return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery()
- .eq(EnergyIndex::getNodeId, nodeId)
- .eq(EnergyIndex::getMeterId, meterId)
- .like(EnergyIndex::getCode, indexCode));
+ List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByMeterIdIndexCode(meterId,indexCode,nodeId);
+ return energyIndexList;
+ }
+
+ /**
+ * 鏍规嵁鐢ㄨ兘鍗曞厓id鍜岃澶噄d锛屼互鍙婄偣浣嶇紪鐮佽幏鍙栫偣浣�
+ *
+ * @param nodeId 鑺傜偣id
+ * @param meterId 璁惧id
+ * @return
+ */
+ @Override
+ public List<EnergyIndex> listDeviceIndex(String nodeId, String meterId) {
+ List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByMeterIdIndexCode(meterId,null,nodeId);
+ return energyIndexList;
}
}
--
Gitblit v1.9.3