ETM-Schurig
/
powersync-experience-energy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes

master
Michael Zanetti 2021-11-28 01:40:09 +01:00
parent bddaae3d91
commit d494e5a181
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/energylogger.cpp
View File

@ -601,8 +601,9 @@ bool EnergyLogger::samplePowerBalance(SampleRate sampleRate, SampleRate baseSamp
return false; return false;
} }
if (query.size() > 0) { int resultCount = 0;
while (query.next()) { while (query.next()) {
resultCount++;
qCDebug(dcEnergyExperience()) << "Frame:" << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString() << query.value("consumption").toDouble() << query.value("production").toDouble() << query.value("acquisition").toDouble() << query.value("storage").toDouble() << query.value("totalConsumption").toDouble() << query.value("totalProduction").toDouble() << query.value("totalAcquisition").toDouble() << query.value("totalReturn").toDouble(); qCDebug(dcEnergyExperience()) << "Frame:" << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString() << query.value("consumption").toDouble() << query.value("production").toDouble() << query.value("acquisition").toDouble() << query.value("storage").toDouble() << query.value("totalConsumption").toDouble() << query.value("totalProduction").toDouble() << query.value("totalAcquisition").toDouble() << query.value("totalReturn").toDouble();
medianConsumption += query.value("consumption").toDouble(); medianConsumption += query.value("consumption").toDouble();
medianProduction += query.value("production").toDouble(); medianProduction += query.value("production").toDouble();
@ -613,6 +614,7 @@ bool EnergyLogger::samplePowerBalance(SampleRate sampleRate, SampleRate baseSamp
totalAcquisition = query.value("totalAcquisition").toDouble(); totalAcquisition = query.value("totalAcquisition").toDouble();
totalReturn = query.value("totalReturn").toDouble(); totalReturn = query.value("totalReturn").toDouble();
} }
if (resultCount > 0) {
medianConsumption = medianConsumption * baseSampleRate / sampleRate; medianConsumption = medianConsumption * baseSampleRate / sampleRate;
medianProduction = medianProduction * baseSampleRate / sampleRate; medianProduction = medianProduction * baseSampleRate / sampleRate;
medianAcquisition = medianAcquisition * baseSampleRate / sampleRate; medianAcquisition = medianAcquisition * baseSampleRate / sampleRate;
@ -681,7 +683,7 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat
{ {
QDateTime sampleStart = sampleEnd.addMSecs(-sampleRate * 60 * 1000); QDateTime sampleStart = sampleEnd.addMSecs(-sampleRate * 60 * 1000);
qCDebug(dcEnergyExperience()) << "Sampling thing power for" << thingId.toString() << sampleRate << "from" << sampleStart << "to" << sampleEnd; qCDebug(dcEnergyExperience()) << "Sampling thing power for" << thingId.toString() << sampleRate << "from" << sampleStart.toString() << "to" << sampleEnd.toString();
double medianCurrentPower = 0; double medianCurrentPower = 0;
double totalConsumption = 0; double totalConsumption = 0;
@ -701,13 +703,18 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat
return false; return false;
} }
if (query.size() > 0) { qCDebug(dcEnergyExperience()) << "Query:" << query.executedQuery();
qCDebug(dcEnergyExperience()) << "Results:" << query.size();
int resultCount = 0;
while (query.next()) { while (query.next()) {
resultCount++;
qCDebug(dcEnergyExperience()) << "Frame:" << query.value("currentPower").toDouble() << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString(); qCDebug(dcEnergyExperience()) << "Frame:" << query.value("currentPower").toDouble() << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString();
medianCurrentPower += query.value("currentPower").toDouble(); medianCurrentPower += query.value("currentPower").toDouble();
totalConsumption = query.value("totalConsumption").toDouble(); totalConsumption = query.value("totalConsumption").toDouble();
totalProduction = query.value("totalProduction").toDouble(); totalProduction = query.value("totalProduction").toDouble();
} }
if (resultCount > 0) {
medianCurrentPower = medianCurrentPower * baseSampleRate / sampleRate; medianCurrentPower = medianCurrentPower * baseSampleRate / sampleRate;
} else { } else {
@ -715,7 +722,8 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat
// to at least copy the totals from where we left off. // to at least copy the totals from where we left off.
query = QSqlQuery(m_db); query = QSqlQuery(m_db);
query.prepare("SELECT MAX(timestamp), currentPower, totalConsumption, totalProduction FROM thingPower WHERE sampleRate = ?;"); query.prepare("SELECT MAX(timestamp), currentPower, totalConsumption, totalProduction FROM thingPower WHERE thingId = ? AND sampleRate = ?;");
query.addBindValue(thingId);
query.addBindValue(baseSampleRate); query.addBindValue(baseSampleRate);
query.exec(); query.exec();
if (query.lastError().isValid()) { if (query.lastError().isValid()) {
@ -731,7 +739,7 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat
} }
qCDebug(dcEnergyExperience()) << "Sampled:" << thingId << sampleRate << "media currentpower:" << medianCurrentPower << "total consumption:" << totalConsumption << "total production:" << totalProduction; qCDebug(dcEnergyExperience()) << "Sampled:" << thingId.toString() << sampleRate << "median currentPower:" << medianCurrentPower << "total consumption:" << totalConsumption << "total production:" << totalProduction;
return insertThingPower(sampleEnd, sampleRate, thingId, medianCurrentPower, totalConsumption, totalProduction); return insertThingPower(sampleEnd, sampleRate, thingId, medianCurrentPower, totalConsumption, totalProduction);
} }