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

统计报表-功率曲线：统一逻辑，储能功能取值字段secondary_total_active_power修改为取total_active_power；负荷功率=电网功率+光伏功率-储能功率

Browse Source
This commit is contained in:
zq
2025-12-23 14:09:17 +08:00
parent 21fe3af17c
commit 289fbc4d3a
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java
View File

@ -12,7 +12,7 @@ public class PointDataResponse{
private BigDecimal gridPower; private BigDecimal gridPower;
/** 负载功率 */ /** 负载功率 */
private BigDecimal loadPower; private BigDecimal loadPower;
/** 储能功率-secondary_total_active_power(METE) */ /** 储能功率-total_active_power(METE) */
private BigDecimal storagePower; private BigDecimal storagePower;
/** 光伏功率-total_active_power(METEGT) */ /** 光伏功率-total_active_power(METEGT) */
private BigDecimal pvPower; private BigDecimal pvPower;

2
ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java
View File

@ -22,7 +22,7 @@ public class PowerStatisListVo {
private BigDecimal loadPower; private BigDecimal loadPower;
/** /**
* 储能功率-secondary_total_active_power(METE) * 储能功率-total_active_power(METE)
*/ */
private BigDecimal storagePower; private BigDecimal storagePower;

17
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
View File

@ -577,15 +577,18 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
BigDecimal pvPower = powerStatisListVo.getPvPower() == null ? BigDecimal.ZERO : powerStatisListVo.getPvPower(); BigDecimal pvPower = powerStatisListVo.getPvPower() == null ? BigDecimal.ZERO : powerStatisListVo.getPvPower();
BigDecimal loadPower = new BigDecimal(0); BigDecimal loadPower = new BigDecimal(0);
// 电动所：负荷功率=电网功率+光伏功率-储能功率 // 负荷功率=电网功率+光伏功率-储能功率
if (SiteEnum.DDS.getCode().equals(siteId)){
loadPower = gridPower.add(pvPower).subtract(storagePower); loadPower = gridPower.add(pvPower).subtract(storagePower);
powerStatisListVo.setLoadPower(loadPower); powerStatisListVo.setLoadPower(loadPower);
} else if (SiteEnum.FX.getCode().equals(siteId)){ // // 电动所：负荷功率=电网功率+光伏功率-储能功率
// 奉贤：负荷功率=电网功率-储能功率； // if (SiteEnum.DDS.getCode().equals(siteId)){
loadPower = gridPower.subtract(storagePower); // loadPower = gridPower.add(pvPower).subtract(storagePower);
powerStatisListVo.setLoadPower(loadPower); // powerStatisListVo.setLoadPower(loadPower);
} // } else if (SiteEnum.FX.getCode().equals(siteId)){
// // 奉贤：负荷功率=电网功率-储能功率；
// loadPower = gridPower.subtract(storagePower);
// powerStatisListVo.setLoadPower(loadPower);
// }
} }
} }

2
ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
View File

@ -977,7 +977,7 @@
</select> </select>
<sql id="powerFilter"> <sql id="powerFilter">
MAX(CASE WHEN t.device_id = 'METE' THEN t.secondary_total_active_power END) AS storagePower, MAX(CASE WHEN t.device_id = 'METE' THEN t.total_active_power END) AS storagePower,
MAX(CASE WHEN t.device_id = 'LOAD' THEN t.total_active_power END) AS gridPower, MAX(CASE WHEN t.device_id = 'LOAD' THEN t.total_active_power END) AS gridPower,
MAX(CASE WHEN t.device_id = 'METEGF' THEN t.total_active_power END) AS pvPower MAX(CASE WHEN t.device_id = 'METEGF' THEN t.total_active_power END) AS pvPower
</sql> </sql>