From 3ef2e9d87847763b7b2cae55fe52f75d5ef7f65f Mon Sep 17 00:00:00 2001 From: DYL <Dn1332079466> Date: 星期一, 10 二月 2025 11:05:22 +0800 Subject: [PATCH] 电能负荷分析 --- zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 10 +++++----- 1 files changed, 5 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 8269d9d..47e57ca 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 @@ -321,15 +321,15 @@ /** * 鏍规嵁鐢ㄨ兘鍗曞厓id鍜岃澶噄d锛屼互鍙婄偣浣嶇紪鐮佽幏鍙栫偣浣� * - * @param energyUnitId 鐢ㄨ兘鍗曞厓id + * @param nodeId 鑺傜偣id * @param meterId 璁惧id * @param indexCode 鐐逛綅缂栫爜鎴栬�呯偣浣嶇紪鐮佺殑涓�閮ㄥ垎 * @return */ @Override - public EnergyIndex getDeviceIndexByCode(String energyUnitId, String meterId, String indexCode) { + public EnergyIndex getDeviceIndexByCode(String nodeId, String meterId, String indexCode) { - List<EnergyIndex> energyIndexList = listDeviceIndexByCode(energyUnitId, meterId, indexCode); + List<EnergyIndex> energyIndexList = listDeviceIndexByCode(nodeId, meterId, indexCode); EnergyIndex energyIndex = energyIndexList.stream().findFirst().orElse(null); if (ObjectUtils.isEmpty(energyIndex)) { energyIndex = new EnergyIndex(); @@ -347,8 +347,8 @@ */ public List<EnergyIndex> listDeviceIndexByCode(String energyUnitId, String meterId, String indexCode) { return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery() - .eq(EnergyIndex::getEnergyUnitId, energyUnitId) - .eq(EnergyIndex::getEnergyUnitToDeviceId, meterId) + .eq(EnergyIndex::getNodeId, energyUnitId) + .eq(EnergyIndex::getMeterId, meterId) .like(EnergyIndex::getCode, indexCode)); } } -- Gitblit v1.9.3