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

0929-部分数据优化

Browse Source
This commit is contained in:
mashili
2025-09-29 20:05:16 +08:00
parent 2bbc0abc08
commit 7121fdecfa
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,13 +387,13 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
String tarteDate = DateUtils.convertToString(targetMinute);
PowerStatisListVo currentData = dataMap.get(tarteDate);
if (currentData == null && lastData != null) {
BigDecimal pvPower = lastData.getPvPower();
BigDecimal storagePower = lastData.getStoragePower();
BigDecimal gridPower = lastData.getGridPower();
BigDecimal pvPower = lastData.getPvPower()==null?new BigDecimal(0) :lastData.getGridPower();
BigDecimal storagePower = lastData.getStoragePower()==null?new BigDecimal(0) :lastData.getGridPower();
BigDecimal gridPower = lastData.getGridPower()==null?new BigDecimal(0) :lastData.getGridPower();
currentData = new PowerStatisListVo(tarteDate.toString(),gridPower,storagePower,pvPower);
} else if (currentData == null && lastData == null){
// 开头无数据，所有字段设为null
currentData = new PowerStatisListVo(tarteDate.toString(), null, null, null);
currentData = new PowerStatisListVo(tarteDate.toString(), new BigDecimal(0), new BigDecimal(0), new BigDecimal(0));
}
lastData = currentData;
powerStatisListVoList.add(currentData);

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

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

1
ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
View File

@ -383,7 +383,6 @@
SELECT p.device_id, MAX(p.data_update_time) AS max_update_time
FROM ems_pcs_data p
where p.site_id = #{siteId}
and p.data_update_time &lt;= CURDATE()
GROUP BY p.device_id
) latest inner join ems_pcs_data t ON latest.device_id = t.device_id
AND latest.max_update_time = t.data_update_time