From 768dd0beadab8bb4a05ac4ddd3c636a98e107fd5 Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 23 Jan 2026 15:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E8=AE=BE=E5=A4=87=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=80=BC=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index b758498..15f6a75 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -746,7 +746,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService { private void dealAmmeterData(EmsAmmeterData ammeterData, AmmeterDataVo ammeterDataVo) { if (ammeterData != null) { - ammeterDataVo.setActivePower(ammeterData.getTotalActivePower()); + ammeterDataVo.setActivePower(ammeterData.getTotalActivePower() == null ? ammeterData.getPower() : ammeterData.getTotalActivePower()); ammeterDataVo.setReactivePower(ammeterData.getTotalReactivePower()); ammeterDataVo.setForwardActive(ammeterData.getCurrentForwardActiveTotal()); ammeterDataVo.setForwardReactive(ammeterData.getCurrentForwardReactiveTotal());