|
|
@@ -203,14 +203,16 @@ public class VppDrMonitorServiceImpl implements VppDrMonitorService {
|
|
|
|
|
|
SiteBaselineVO baseline = baselineService.getSiteBaseline(
|
|
|
invitation.getSiteId(), responseStart.format(DATE_TIME_FMT));
|
|
|
- BigDecimal actualKw = nz(invitation.getActualResponseCapacityKw()).setScale(SCALE, RoundingMode.HALF_UP);
|
|
|
+ // [临时注释] 实际响应容量:从邀约表 actual_response_capacity_kw 取值;接口暂不返回,恢复时取消注释
|
|
|
+ // BigDecimal actualKw = nz(invitation.getActualResponseCapacityKw()).setScale(SCALE, RoundingMode.HALF_UP);
|
|
|
Map<String, BigDecimal> actualLoadByTime = queryActualLoadByTime(
|
|
|
invitation.getSiteId(), tenantId, queryStart, queryEnd);
|
|
|
|
|
|
DrMonitorCurveVO curve = new DrMonitorCurveVO();
|
|
|
curve.setId(invitation.getId());
|
|
|
curve.setSiteId(invitation.getSiteId());
|
|
|
- curve.setActualResponseCapacityKw(actualKw);
|
|
|
+ // [临时注释] 实际响应容量合计赋值;接口暂不返回,恢复时取消注释
|
|
|
+ // curve.setActualResponseCapacityKw(actualKw);
|
|
|
if (invitation.getExecuteStartDate() != null) {
|
|
|
curve.setResponseDate(invitation.getExecuteStartDate().format(DATE_FMT));
|
|
|
} else if (event != null && event.getStartTime() != null) {
|
|
|
@@ -234,7 +236,8 @@ public class VppDrMonitorServiceImpl implements VppDrMonitorService {
|
|
|
curvePoint.setTime(timeKey);
|
|
|
curvePoint.setBaselineKw(scaleKw(baselineByTime.get(timeKey)));
|
|
|
curvePoint.setActualLoadKw(scaleKw(actualLoadByTime.get(timeKey)));
|
|
|
- curvePoint.setActualResponseCapacityKw(actualKw);
|
|
|
+ // [临时注释] 各时刻实际响应容量(与邀约合计相同);接口暂不返回,恢复时取消注释
|
|
|
+ // curvePoint.setActualResponseCapacityKw(actualKw);
|
|
|
curve.getPoints().add(curvePoint);
|
|
|
cursor = cursor.plusMinutes(interval);
|
|
|
}
|