From 377ef8dfb62acc8fa934cfdc736b319868f33d0b Mon Sep 17 00:00:00 2001 From: letsgocoding <sdxt_0802@163.com> Date: 星期三, 12 二月 2025 16:01:15 +0800 Subject: [PATCH] !65 电能质量分析--负荷分析数据获取获取实时数据修改 Merge pull request !65 from letsgocoding/wt_from_develop1.0 --- zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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..16d8a62 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,21 @@ * @return */ public List<EnergyIndex> listDeviceIndexByCode(String nodeId, String meterId, String 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) { return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery() .eq(EnergyIndex::getNodeId, nodeId) - .eq(EnergyIndex::getMeterId, meterId) - .like(EnergyIndex::getCode, indexCode)); + .eq(EnergyIndex::getMeterId, meterId)); } } -- Gitblit v1.9.3