ETM-Schurig
/
nymea-experience-plugin-evdash
mirror of https://github.com/nymea/nymea-experience-plugin-evdash.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start implementing logdb fetch

initial-version
Simon Stürz 2025-12-16 17:02:19 +01:00
parent 395e1ce5cb
commit 46824a1b8f
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugin/evdashengine.cpp
View File

@ -35,6 +35,7 @@
#include "chargingsessionsdbusinterfaceclient.h"
#include <integrations/thingmanager.h>
#include <logging/logengine.h>
#include <QWebSocket>
#include <QWebSocketServer>
@ -51,9 +52,10 @@
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(dcEvDashExperience)
EvDashEngine::EvDashEngine(ThingManager *thingManager, EvDashWebServerResource *webServerResource, QObject *parent)
EvDashEngine::EvDashEngine(ThingManager *thingManager, LogEngine *logEngine, EvDashWebServerResource *webServerResource, QObject *parent)
: QObject{parent},
m_thingManager{thingManager},
m_logEngine{logEngine},
m_webServerResource{webServerResource}
{
Things configuredThings = m_thingManager->configuredThings();
@ -525,6 +527,28 @@ QJsonObject EvDashEngine::packCharger(Thing *charger) const
chargerObject.insert("pluggedIn", charger->stateValue("pluggedIn").toBool());
chargerObject.insert("chargingAllowed", charger->stateValue("power").toBool());
QString stateName = "power";
chargerObject.insert(stateName, charger->stateValue(stateName).toString());
QString source = QString("state-%1-%2").arg(charger->id().toString(QUuid::WithBraces), stateName);
LogFetchJob *job = m_logEngine->fetchLogEntries(
{source},
{stateName},
{}, {}, {}, // start/end/filter
Types::SampleRateAny,
Qt::DescendingOrder,
0, 1 // offset, limit
);
connect(job, &LogFetchJob::finished, this, [](const LogEntries &entries) {
if (entries.isEmpty()) {
qCDebug(dcEvDashExperience()) << "##### Last state change unknwon";
return;
}
//qint64 lastChangeMs = entries.first().timestamp().toMSecsSinceEpoch();
qCDebug(dcEvDashExperience()) << "##### Last state change" << entries.first().timestamp().toString();
});
if (charger->hasState("currentVersion"))
chargerObject.insert("version", charger->stateValue("currentVersion").toDouble());
@ -541,8 +565,10 @@ QJsonObject EvDashEngine::packCharger(Thing *charger) const
if (charger->hasState("error"))
chargerObject.insert("error", charger->stateValue("error").toString());
if (charger->hasState("status"))
chargerObject.insert("status", charger->stateValue("status").toString());
if (charger->hasState("status")) {
}
if (charger->hasState("digitalInputMode"))
chargerObject.insert("digitalInputMode", charger->stateValue("digitalInputMode").toInt());

4
plugin/evdashengine.h
View File

@ -43,6 +43,7 @@ class QWebSocket;
class QWebSocketServer;
class Thing;
class LogEngine;
class ThingManager;
class EnergyManagerDbusClient;
class EvDashWebServerResource;
@ -61,7 +62,7 @@ public:
};
Q_ENUM(EvDashError)
explicit EvDashEngine(ThingManager *thingManager, EvDashWebServerResource *webServerResource, QObject *parent = nullptr);
explicit EvDashEngine(ThingManager *thingManager, LogEngine *logEngine, EvDashWebServerResource *webServerResource, QObject *parent = nullptr);
~EvDashEngine() override;
bool enabled() const;
@ -78,6 +79,7 @@ private slots:
private:
ThingManager *m_thingManager = nullptr;
LogEngine *m_logEngine = nullptr;
EvDashWebServerResource *m_webServerResource = nullptr;
bool m_enabled = false;

2
plugin/experiencepluginevdash.cpp
View File

@ -50,7 +50,7 @@ void ExperiencePluginEvDash::init()
qCDebug(dcEvDashExperience()) << "Initializing experience...";
m_resource = new EvDashWebServerResource(this);
m_engine = new EvDashEngine(thingManager(), m_resource, this);
m_engine = new EvDashEngine(thingManager(), logEngine(), m_resource, this);
jsonRpcServer()->registerExperienceHandler(new EvDashJsonHandler(m_engine, m_resource, this), 1, 0);
}