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());