From e79ee6bbcd4517b6095d978fa04756026b7fdc13 Mon Sep 17 00:00:00 2001
From: shi_jq <shi_jq@sina.com>
Date: Mon, 17 Mar 2025 11:47:10 +0800
Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 product/src/gui/plugin/ConstCurves/CConstCurves.cpp       | 2 +-
 product/src/gui/plugin/ConstCurves/CConstCurves.h         | 2 +-
 product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp | 2 +-
 product/src/gui/plugin/ConstCurves/CConstPluginWidget.h   | 4 ++--
 product/src/gui/plugin/ConstCurves/CCurveChartView.cpp    | 2 +-
 product/src/gui/plugin/ConstCurves/CCurveChartView.h      | 2 +-
 product/src/gui/plugin/ConstCurves/CDbInterface.cpp       | 2 +-
 product/src/gui/plugin/ConstCurves/CDbInterface.h         | 2 +-
 product/src/gui/plugin/ConstCurves/CMessageManage.cpp     | 8 +++-----
 product/src/gui/plugin/ConstCurves/CMessageManage.h       | 2 +-
 product/src/gui/plugin/ConstCurves/main.cpp               | 2 +-
 11 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/product/src/gui/plugin/ConstCurves/CConstCurves.cpp b/product/src/gui/plugin/ConstCurves/CConstCurves.cpp
index 4fcffc5d..fd403624 100644
--- a/product/src/gui/plugin/ConstCurves/CConstCurves.cpp
+++ b/product/src/gui/plugin/ConstCurves/CConstCurves.cpp
@@ -1,4 +1,4 @@
-#include "CConstCurves.h"
+#include "CConstCurves.h"
 #include "ui_CConstCurves.h"
 #include "pub_logger_api/logger.h"
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/ConstCurves/CConstCurves.h b/product/src/gui/plugin/ConstCurves/CConstCurves.h
index ee7a1eb0..9f098338 100644
--- a/product/src/gui/plugin/ConstCurves/CConstCurves.h
+++ b/product/src/gui/plugin/ConstCurves/CConstCurves.h
@@ -1,4 +1,4 @@
-#ifndef CCONSTCURVES_H
+#ifndef CCONSTCURVES_H
 #define CCONSTCURVES_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp b/product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp
index 859c9d64..83ae4cd1 100644
--- a/product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp
+++ b/product/src/gui/plugin/ConstCurves/CConstPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CConstPluginWidget.h"
+#include "CConstPluginWidget.h"
 #include "CConstCurves.h"
 #include <QWidget>
 
diff --git a/product/src/gui/plugin/ConstCurves/CConstPluginWidget.h b/product/src/gui/plugin/ConstCurves/CConstPluginWidget.h
index 9bd3267c..5cd75708 100644
--- a/product/src/gui/plugin/ConstCurves/CConstPluginWidget.h
+++ b/product/src/gui/plugin/ConstCurves/CConstPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CCONSTPLUGINWIDGET_H
+#ifndef CCONSTPLUGINWIDGET_H
 #define CCONSTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CConstPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ConstCurves/CCurveChartView.cpp b/product/src/gui/plugin/ConstCurves/CCurveChartView.cpp
index f2ccdadc..7bbac294 100644
--- a/product/src/gui/plugin/ConstCurves/CCurveChartView.cpp
+++ b/product/src/gui/plugin/ConstCurves/CCurveChartView.cpp
@@ -1,4 +1,4 @@
-#include "CCurveChartView.h"
+#include "CCurveChartView.h"
 #include <QLayout>
 
 CCurveChartView::CCurveChartView(QWidget *parent)
diff --git a/product/src/gui/plugin/ConstCurves/CCurveChartView.h b/product/src/gui/plugin/ConstCurves/CCurveChartView.h
index a6b69749..ea52a9f5 100644
--- a/product/src/gui/plugin/ConstCurves/CCurveChartView.h
+++ b/product/src/gui/plugin/ConstCurves/CCurveChartView.h
@@ -1,4 +1,4 @@
-#ifndef CURVECHARTVIEW_H
+#ifndef CURVECHARTVIEW_H
 #define CURVECHARTVIEW_H
 
 #include <QtCharts/QChartView>
diff --git a/product/src/gui/plugin/ConstCurves/CDbInterface.cpp b/product/src/gui/plugin/ConstCurves/CDbInterface.cpp
index 98c282aa..fd399be0 100644
--- a/product/src/gui/plugin/ConstCurves/CDbInterface.cpp
+++ b/product/src/gui/plugin/ConstCurves/CDbInterface.cpp
@@ -1,4 +1,4 @@
-#include "CDbInterface.h"
+#include "CDbInterface.h"
 
 using namespace iot_dbms;
 
diff --git a/product/src/gui/plugin/ConstCurves/CDbInterface.h b/product/src/gui/plugin/ConstCurves/CDbInterface.h
index 84c7c6ea..2e7480bb 100644
--- a/product/src/gui/plugin/ConstCurves/CDbInterface.h
+++ b/product/src/gui/plugin/ConstCurves/CDbInterface.h
@@ -1,4 +1,4 @@
-#ifndef CDBDATAMANAGE_H
+#ifndef CDBDATAMANAGE_H
 #define CDBDATAMANAGE_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/ConstCurves/CMessageManage.cpp b/product/src/gui/plugin/ConstCurves/CMessageManage.cpp
index bdb63201..b0625a72 100644
--- a/product/src/gui/plugin/ConstCurves/CMessageManage.cpp
+++ b/product/src/gui/plugin/ConstCurves/CMessageManage.cpp
@@ -1,4 +1,4 @@
-#include "CMessageManage.h"
+#include "CMessageManage.h"
 #include "pub_logger_api/logger.h"
 #include <QDateTime>
 #include "CDbInterface.h"
@@ -34,14 +34,13 @@ bool CMessageManage::sendMessage(const SReadQueue& queueList, int nDstDomainId)
     iot_net::CMbMessage msg;
     msg.setMsgType(MT_OPT_COMMON_DOWN);
     msg.setSubject(E_PSCADA_APPID, CH_HMI_TO_OPT_OPTCMD_DOWN);
-    COptCustCtrlRequest cOptCustCtrlRequest;
     SOptCustCtrlRequest sOptCustCtrlRequest;
     sOptCustCtrlRequest.stHead = createReqHead(nDstDomainId);
     sOptCustCtrlRequest.strKeyIdTag = QString("fes_const.%1.value").arg(queueList.tag_name).toStdString();
     sOptCustCtrlRequest.strRtuTag = queueList.rtu_tag.toStdString();
     sOptCustCtrlRequest.vecOptCustCtrlQueue = createCtrlQueue(queueList.dev_id);
 
-    std::string content = cOptCustCtrlRequest.generate(sOptCustCtrlRequest);
+    std::string content = COptCustCtrlRequest::generate(sOptCustCtrlRequest);
     msg.setData(content);
 
     if(!m_communicator->sendMsgToDomain(msg, nDstDomainId))
@@ -71,10 +70,9 @@ void CMessageManage::recvMessage()
             return;
         }
 
-        COptCustCtrlReply cOptCustCtrlReply;
         SOptCustCtrlReply sOptCustCtrlReply;
         std::string str((const char*)msg.getDataPtr(), msg.getDataSize());
-        cOptCustCtrlReply.parse(str, sOptCustCtrlReply);
+        COptCustCtrlReply::parse(str, sOptCustCtrlReply);
 
         parseMsg(sOptCustCtrlReply);
     }
diff --git a/product/src/gui/plugin/ConstCurves/CMessageManage.h b/product/src/gui/plugin/ConstCurves/CMessageManage.h
index 1af05921..0924981f 100644
--- a/product/src/gui/plugin/ConstCurves/CMessageManage.h
+++ b/product/src/gui/plugin/ConstCurves/CMessageManage.h
@@ -1,4 +1,4 @@
-#ifndef CMESSAGEMANAGE_H
+#ifndef CMESSAGEMANAGE_H
 #define CMESSAGEMANAGE_H
 
 #include "net/net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/ConstCurves/main.cpp b/product/src/gui/plugin/ConstCurves/main.cpp
index 3007447a..dbaab4d7 100644
--- a/product/src/gui/plugin/ConstCurves/main.cpp
+++ b/product/src/gui/plugin/ConstCurves/main.cpp
@@ -1,4 +1,4 @@
-#include "CConstCurves.h"
+#include "CConstCurves.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "dp_chg_data_api/CDpcdaForApp.h"