CL-Softwares
/
PowerMaster
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor:调整事件数据服务模块中(alarmEventDataService)中历史数据查询的相关逻辑

This commit is contained in:
duanshengchao 2025-11-12 10:06:10 +08:00
parent 1037b0b2a9
commit faa0ad8af4
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/alarmEventDataService.h
View File

@ -18,6 +18,7 @@ class QTimer;
class AlarmEventDataService : public QObject class AlarmEventDataService : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(AlarmEventDataService) //禁止拷贝，等价于：AlarmEventDataService(const AlarmEventDataService&) = delete; AlarmEventDataService& operator=(const AlarmEventDataService&) = delete;
public: public:
static AlarmEventDataService* instance(); static AlarmEventDataService* instance();
@ -29,7 +30,7 @@ public:
signals: signals:
void realTimeEventReceived(const EventData& event); void realTimeEventReceived(const EventData& event);
void historicalQueryError(const QString& msg); void historicalQueryError(const QString& msg);
void historicalQuertData(const QList<EventData>& events); void historicalQueryData(const QList<EventData>& events);
private slots: private slots:
void onRabbitMQConnected(); void onRabbitMQConnected();

1
include/alarmEventDataView.h
View File

@ -84,6 +84,7 @@ signals:
private slots: private slots:
void onTimeoutSimulateData(); void onTimeoutSimulateData();
void onRealTimeEventReceived(const EventData& event); void onRealTimeEventReceived(const EventData& event);
void onHistoricalEventsReceived(const QList<EventData>& events);
private: private:
void iniHeaderData(); void iniHeaderData();

4
source/alarmEventDataService.cpp
View File

@ -233,10 +233,10 @@ void AlarmEventDataService::processHistoricalResponse(const QByteArray& data)
QJsonObject eventObj = eventValue.toObject(); QJsonObject eventObj = eventValue.toObject();
EventData event = EventData::fromJson(eventObj); EventData event = EventData::fromJson(eventObj);
if(!event.id.isEmpty()) if(validateEvent(event))
historicalEvents.append(event); historicalEvents.append(event);
} }
emit historicalQuertData(historicalEvents); emit historicalQueryData(historicalEvents);
} }
} }

8
source/alarmEventDataView.cpp
View File

@ -1,4 +1,5 @@
#include "alarmEventDataView.h" #include "alarmEventDataView.h"
#include "alarmEventDataService.h"
#include <QHeaderView> #include <QHeaderView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPainter> #include <QPainter>
@ -28,6 +29,8 @@ AlarmEventDataModel::AlarmEventDataModel(AlarmDataMode mode, QObject* parent)
m_paginationInfo.totalEntries = 0; m_paginationInfo.totalEntries = 0;
iniHeaderData(); iniHeaderData();
connect(AlarmEventDataService::instance(), &AlarmEventDataService::realTimeEventReceived, this, &AlarmEventDataModel::onRealTimeEventReceived);
connect(AlarmEventDataService::instance(), &AlarmEventDataService::historicalQueryData, this, &AlarmEventDataModel::onHistoricalEventsReceived);
//实时数据测试 //实时数据测试
m_simulatedDataTimer = new QTimer(this); m_simulatedDataTimer = new QTimer(this);
connect(m_simulatedDataTimer, &QTimer::timeout, this, &AlarmEventDataModel::onTimeoutSimulateData); connect(m_simulatedDataTimer, &QTimer::timeout, this, &AlarmEventDataModel::onTimeoutSimulateData);
@ -349,6 +352,11 @@ void AlarmEventDataModel::onRealTimeEventReceived(const EventData& event)
emit receivedNewAlarm(event); emit receivedNewAlarm(event);
} }
void AlarmEventDataModel::onHistoricalEventsReceived(const QList<EventData>& events)
{
}
bool AlarmEventDataModel::setCurrentPage(int page) bool AlarmEventDataModel::setCurrentPage(int page)
{ {
if(m_paginationInfo.currentPage != page && page > 0 && page <= m_paginationInfo.totalPages) if(m_paginationInfo.currentPage != page && page > 0 && page <= m_paginationInfo.totalPages)