GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ref]同步711

Browse Source
This commit is contained in:
shi_jq 2025-03-17 11:47:10 +08:00
parent db4a437bd4
commit e79ee6bbcd
11 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
product/src/gui/plugin/ConstCurves/CConstCurves.cpp
View File

@ -1,4 +1,4 @@
#include "CConstCurves.h" #include "CConstCurves.h"
#include "ui_CConstCurves.h" #include "ui_CConstCurves.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include <QMessageBox> #include <QMessageBox>

2
product/src/gui/plugin/ConstCurves/CConstCurves.h
View File

@ -1,4 +1,4 @@
#ifndef CCONSTCURVES_H #ifndef CCONSTCURVES_H
#define CCONSTCURVES_H #define CCONSTCURVES_H
#include <QWidget> #include <QWidget>

2
product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CConstPluginWidget.h" #include "CConstPluginWidget.h"
#include "CConstCurves.h" #include "CConstCurves.h"
#include <QWidget> #include <QWidget>

4
product/src/gui/plugin/ConstCurves/CConstPluginWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CCONSTPLUGINWIDGET_H #ifndef CCONSTPLUGINWIDGET_H
#define CCONSTPLUGINWIDGET_H #define CCONSTPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CConstPluginWidget : public QObject, public CPluginWidgetInterface class CConstPluginWidget : public QObject, public CPluginWidgetInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
Q_INTERFACES(CPluginWidgetInterface) Q_INTERFACES(CPluginWidgetInterface)
public: public:

2
product/src/gui/plugin/ConstCurves/CCurveChartView.cpp
View File

@ -1,4 +1,4 @@
#include "CCurveChartView.h" #include "CCurveChartView.h"
#include <QLayout> #include <QLayout>
CCurveChartView::CCurveChartView(QWidget *parent) CCurveChartView::CCurveChartView(QWidget *parent)

2
product/src/gui/plugin/ConstCurves/CCurveChartView.h
View File

@ -1,4 +1,4 @@
#ifndef CURVECHARTVIEW_H #ifndef CURVECHARTVIEW_H
#define CURVECHARTVIEW_H #define CURVECHARTVIEW_H
#include <QtCharts/QChartView> #include <QtCharts/QChartView>

2
product/src/gui/plugin/ConstCurves/CDbInterface.cpp
View File

@ -1,4 +1,4 @@
#include "CDbInterface.h" #include "CDbInterface.h"
using namespace iot_dbms; using namespace iot_dbms;

2
product/src/gui/plugin/ConstCurves/CDbInterface.h
View File

@ -1,4 +1,4 @@
#ifndef CDBDATAMANAGE_H #ifndef CDBDATAMANAGE_H
#define CDBDATAMANAGE_H #define CDBDATAMANAGE_H
#include <QMap> #include <QMap>

8
product/src/gui/plugin/ConstCurves/CMessageManage.cpp
View File

@ -1,4 +1,4 @@
#include "CMessageManage.h" #include "CMessageManage.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include <QDateTime> #include <QDateTime>
#include "CDbInterface.h" #include "CDbInterface.h"
@ -34,14 +34,13 @@ bool CMessageManage::sendMessage(const SReadQueue& queueList, int nDstDomainId)
iot_net::CMbMessage msg; iot_net::CMbMessage msg;
msg.setMsgType(MT_OPT_COMMON_DOWN); msg.setMsgType(MT_OPT_COMMON_DOWN);
msg.setSubject(E_PSCADA_APPID, CH_HMI_TO_OPT_OPTCMD_DOWN); msg.setSubject(E_PSCADA_APPID, CH_HMI_TO_OPT_OPTCMD_DOWN);
COptCustCtrlRequest cOptCustCtrlRequest;
SOptCustCtrlRequest sOptCustCtrlRequest; SOptCustCtrlRequest sOptCustCtrlRequest;
sOptCustCtrlRequest.stHead = createReqHead(nDstDomainId); sOptCustCtrlRequest.stHead = createReqHead(nDstDomainId);
sOptCustCtrlRequest.strKeyIdTag = QString("fes_const.%1.value").arg(queueList.tag_name).toStdString(); sOptCustCtrlRequest.strKeyIdTag = QString("fes_const.%1.value").arg(queueList.tag_name).toStdString();
sOptCustCtrlRequest.strRtuTag = queueList.rtu_tag.toStdString(); sOptCustCtrlRequest.strRtuTag = queueList.rtu_tag.toStdString();
sOptCustCtrlRequest.vecOptCustCtrlQueue = createCtrlQueue(queueList.dev_id); sOptCustCtrlRequest.vecOptCustCtrlQueue = createCtrlQueue(queueList.dev_id);
std::string content = cOptCustCtrlRequest.generate(sOptCustCtrlRequest); std::string content = COptCustCtrlRequest::generate(sOptCustCtrlRequest);
msg.setData(content); msg.setData(content);
if(!m_communicator->sendMsgToDomain(msg, nDstDomainId)) if(!m_communicator->sendMsgToDomain(msg, nDstDomainId))
@ -71,10 +70,9 @@ void CMessageManage::recvMessage()
return; return;
} }
COptCustCtrlReply cOptCustCtrlReply;
SOptCustCtrlReply sOptCustCtrlReply; SOptCustCtrlReply sOptCustCtrlReply;
std::string str((const char*)msg.getDataPtr(), msg.getDataSize()); std::string str((const char*)msg.getDataPtr(), msg.getDataSize());
cOptCustCtrlReply.parse(str, sOptCustCtrlReply); COptCustCtrlReply::parse(str, sOptCustCtrlReply);
parseMsg(sOptCustCtrlReply); parseMsg(sOptCustCtrlReply);
} }

2
product/src/gui/plugin/ConstCurves/CMessageManage.h
View File

@ -1,4 +1,4 @@
#ifndef CMESSAGEMANAGE_H #ifndef CMESSAGEMANAGE_H
#define CMESSAGEMANAGE_H #define CMESSAGEMANAGE_H
#include "net/net_msg_bus_api/MsgBusApi.h" #include "net/net_msg_bus_api/MsgBusApi.h"

2
product/src/gui/plugin/ConstCurves/main.cpp
View File

@ -1,4 +1,4 @@
#include "CConstCurves.h" #include "CConstCurves.h"
#include <QApplication> #include <QApplication>
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "dp_chg_data_api/CDpcdaForApp.h" #include "dp_chg_data_api/CDpcdaForApp.h"