From 36990e3fc35d1dcf341895b65cba19a0d805f258 Mon Sep 17 00:00:00 2001 From: ustcyc <yincun@163.com> Date: 星期三, 16 四月 2025 20:13:00 +0800 Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems --- zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java index fca2c2d..3a10efa 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java @@ -56,6 +56,7 @@ if (ObjectUtils.isEmpty(meterId)){ return AjaxResult.error("鐢佃〃id涓嶈兘涓虹┖"); } + List<EnergyIndex> energyIndexList = energyIndexService.listDeviceIndex(nodeId, meterId); return AjaxResult.success(electricThreePhaseService.list(timeType, timeCode, energyIndexList, requestType, meterId)); -- Gitblit v1.9.3