优化sql

This commit is contained in:
2025-07-18 20:14:38 +08:00
parent 51e6936d77
commit c51c4be498
6 changed files with 91 additions and 73 deletions

View File

@ -11,6 +11,7 @@ public class EnergyStoragePowVo {
/**
* 显示日期
*/
private Date createDate;
/**

View File

@ -83,4 +83,6 @@ public interface EmsBatteryStackMapper
public List<StackStatisListVo> getStackDataByDay(DateSearchRequest requestVo);
public List<StackStatisListVo> getStackDataByMonth(DateSearchRequest requestVo);
public EmsBatteryStack getSiteSumStackInfo(String siteId);
}

View File

@ -117,12 +117,11 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
if (!StringUtils.isEmpty(siteId)) {
// 实时有功功率/实时无功功率/今日充电量/今日放电量
siteMonitorRunningHeadInfoVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId);
// 电池SOC
// 电池堆SOH
EmsBatteryData emsBatteryData = emsBatteryDataMapper.getBatteryDataBySiteId(siteId);
if (emsBatteryData != null) {
siteMonitorRunningHeadInfoVo.setSoc(emsBatteryData.getSoc());
siteMonitorRunningHeadInfoVo.setSoh(emsBatteryData.getSoh());
// 电池SOC + 电池堆SOH
EmsBatteryStack emsBatteryStack = emsBatteryStackMapper.getSiteSumStackInfo(siteId);
if (emsBatteryStack != null) {
siteMonitorRunningHeadInfoVo.setSoc(emsBatteryStack.getStackSoc());
siteMonitorRunningHeadInfoVo.setSoh(emsBatteryStack.getStackSoh());
}
}
@ -135,8 +134,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
if (!StringUtils.isEmpty(siteId)) {
// 时间暂定今日+昨日
Date today = new Date();
Date today = DateUtils.getNowDate();
Date yesterday = DateUtils.addDays(today, -1);
//储能功率list
List<EnergyStoragePowVo> energyStoragePowList = emsPcsDataMapper.getStoragePowerList(siteId, yesterday, today);
siteMonitorRuningInfoVo.setEnergyStoragePowList(energyStoragePowList);