From 9e8959d40420e33db988ea329642c4e6e6d213d1 Mon Sep 17 00:00:00 2001
From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com>
Date: 星期二, 18 二月 2025 14:22:56 +0800
Subject: [PATCH] !86 删除文件 .DS_Store Merge pull request !86 from zhitan-cloud/develop_Yao
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 aa5f76f..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
@@ -345,10 +345,8 @@
* @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;
}
/**
@@ -360,8 +358,7 @@
*/
@Override
public List<EnergyIndex> listDeviceIndex(String nodeId, String meterId) {
- return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery()
- .eq(EnergyIndex::getNodeId, nodeId)
- .eq(EnergyIndex::getMeterId, meterId));
+ List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByMeterIdIndexCode(meterId,null,nodeId);
+ return energyIndexList;
}
}
--
Gitblit v1.9.3