优化sql
This commit is contained in:
@ -11,6 +11,7 @@ public class EnergyStoragePowVo {
|
||||
/**
|
||||
* 显示日期
|
||||
*/
|
||||
|
||||
private Date createDate;
|
||||
|
||||
/**
|
||||
|
||||
@ -83,4 +83,6 @@ public interface EmsBatteryStackMapper
|
||||
public List<StackStatisListVo> getStackDataByDay(DateSearchRequest requestVo);
|
||||
|
||||
public List<StackStatisListVo> getStackDataByMonth(DateSearchRequest requestVo);
|
||||
|
||||
public EmsBatteryStack getSiteSumStackInfo(String siteId);
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
Reference in New Issue
Block a user