dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
364 changed files with 54014 additions and 1121 deletions
Showing only changes of commit 90e9b004b4 - Show all commits

View File

@ -1004,11 +1004,11 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
EmsAmmeterData yestData = dealDailyChargeDate(siteId, deviceId, dataMete);
// 处理储能电表-METE每日数据(尖、峰、平、谷差值)
if (SiteEnum.FX.getCode().equals(siteId)) {
// if (SiteEnum.FX.getCode().equals(siteId)) {
dealAmmeterDailyDate(siteId, dataMete, dataUpdateTime, lastAmmeterData);
} else if (SiteEnum.DDS.getCode().equals(siteId)) {
dealDailyEnergyData(siteId, dataMete, yestData);
}
// } else if (SiteEnum.DDS.getCode().equals(siteId)) {
// dealDailyEnergyData(siteId, dataMete, yestData);
// }
}
}