xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +55497 -1134
375 changed files with 55497 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 768dd0bead - Show all commits

2
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

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