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 +52692 -1113
354 changed files with 52692 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41b846c7f9 - Show all commits

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

@ -141,8 +141,11 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
if (!StringUtils.isEmpty(siteId)) { if (!StringUtils.isEmpty(siteId)) {
// 实时有功功率/实时无功功率 // 实时有功功率/实时无功功率
SiteMonitorRunningHeadInfoVo tempVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId); SiteMonitorRunningHeadInfoVo tempVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId);
siteMonitorRunningHeadInfoVo.setTotalActivePower(tempVo.getTotalActivePower()); if (tempVo != null) {
siteMonitorRunningHeadInfoVo.setTotalReactivePower(tempVo.getTotalReactivePower()); siteMonitorRunningHeadInfoVo.setTotalActivePower(tempVo.getTotalActivePower());
siteMonitorRunningHeadInfoVo.setTotalReactivePower(tempVo.getTotalReactivePower());
}
// 今日充放电 // 今日充放电
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
LocalDateTime startOfDay = now.with(LocalTime.MIN); LocalDateTime startOfDay = now.with(LocalTime.MIN);