diff --git a/include/measurementDataManager.h b/include/measurementDataManager.h index e871633..7949e57 100644 --- a/include/measurementDataManager.h +++ b/include/measurementDataManager.h @@ -19,8 +19,8 @@ class MeasurementDataManager : public QObject public: static MeasurementDataManager* instance(); - void requestData(const QString& dataID, QObject* requester); - void cancelRequest(const QString& dataID, QObject* requester); + void requestData(const QStringList& measurements, QObject* requester); + void cancelRequest(const QStringList& measurements, QObject* requester); MeasurementDataPoint getLastestRealtimeData(const QString& dataID); void queryHistoricalEvents(const QString& dataID, const QDateTime& startTime, const QDateTime& endTime, const QString& step, const QString& type = "phasor"); @@ -97,7 +97,7 @@ private: QHash> m_dataCache; //请求记录 - QHash> m_dataRequesetRecord; + QHash> m_dataRequesetRecord; }; #endif diff --git a/source/measurementDataManager.cpp b/source/measurementDataManager.cpp index 3ade247..6290f71 100644 --- a/source/measurementDataManager.cpp +++ b/source/measurementDataManager.cpp @@ -298,13 +298,51 @@ void MeasurementDataManager::getSubscriptionRealtimeData() } } -void MeasurementDataManager::requestData(const QString& dataID, QObject* requester) +void MeasurementDataManager::requestData(const QStringList& measurements, QObject* requester) { - //if() + QStringList newRequestDatas; + for(const QString& dataID : measurements) + { + auto it = m_dataRequesetRecord.find(dataID); + if(it != m_dataRequesetRecord.end() && !it.value().contains(requester)) + it.value().insert(requester); + else + { + QSet requesters; + requesters.insert(requester); + m_dataRequesetRecord.insert(dataID, requesters); + newRequestDatas.push_back(dataID); + } + } + + if(!newRequestDatas.isEmpty()) + addSubscriptionData(newRequestDatas); } -void MeasurementDataManager::cancelRequest(const QString& dataID, QObject* requester) -{} +void MeasurementDataManager::cancelRequest(const QStringList& measurements, QObject* requester) +{ + QStringList removeRequestDatas; + for(const QString& dataID : measurements) + { + auto it = m_dataRequesetRecord.find(dataID); + if(it != m_dataRequesetRecord.end()) + { + it.value().remove(requester); + if(it.value().isEmpty()) + removeRequestDatas.push_back(dataID); + } + } + + if(!removeRequestDatas.isEmpty()) + { + removeSubscriptionData(removeRequestDatas); + for(const QString& dataID : std::as_const(removeRequestDatas)) + { + m_dataRequesetRecord.remove(dataID); + m_dataCache.remove(dataID); + } + } +} MeasurementDataPoint MeasurementDataManager::getLastestRealtimeData(const QString& dataID) {