diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.cpp
index d1740b2e..bd0a7601 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmCompare.h"
+#include "CAlarmCompare.h"
 #include "ui_CAlarmCompare.h"
 
 CAlarmCompare::CAlarmCompare(QWidget *parent) :
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.h
index 39f07438..03cc7841 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmCompare.h
@@ -1,4 +1,4 @@
-#ifndef CALARMCOMPARE_H
+#ifndef CALARMCOMPARE_H
 #define CALARMCOMPARE_H
 
 #include <QMainWindow>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmLevelComboBox.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmLevelComboBox.h
index a29111d1..bb1ee9e1 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmLevelComboBox.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmLevelComboBox.h
@@ -1,4 +1,4 @@
-#ifndef CALARMLEVELCOMBOBOX_H
+#ifndef CALARMLEVELCOMBOBOX_H
 #define CALARMLEVELCOMBOBOX_H
 
 #include <QVariant>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.cpp
index 3934d5b8..381284b7 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmModel.h"
+#include "CAlarmModel.h"
 
 CAlarmModel::CAlarmModel()
 {
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.h
index 4876ae4c..d39cdcc8 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmModel.h
@@ -1,4 +1,4 @@
-#ifndef CALARMMODEL_H
+#ifndef CALARMMODEL_H
 #define CALARMMODEL_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.cpp
index e6168a22..4393dd0f 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmReport.h"
+#include "CAlarmReport.h"
 #include "ui_CAlarmReport.h"
 #include "CommonFunction.h"
 
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.h
index de90b4ef..9595ef4c 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmReport.h
@@ -1,4 +1,4 @@
-#ifndef CALARMREPORT_H
+#ifndef CALARMREPORT_H
 #define CALARMREPORT_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp
index 8de243bf..bd220e56 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmStatistics.h"
+#include "CAlarmStatistics.h"
 #include "ui_CAlarmStatistics.h"
 #include "pub_utility_api/I18N.h"
 #include "pub_utility_api/FileStyle.h"
@@ -87,7 +87,6 @@ CAlarmStatistics::~CAlarmStatistics()
         delete m_pProcessDialog;
         m_pProcessDialog = NULL;
 
-        m_pQueryThread->wait();
         delete m_pQueryThread;
         m_pQueryThread = NULL;
 
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.h
index 91dccd46..244045d9 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.h
@@ -1,4 +1,4 @@
-#ifndef CALARMSTATISTICS_H
+#ifndef CALARMSTATISTICS_H
 #define CALARMSTATISTICS_H
 
 #include <QMainWindow>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.cpp
index adc4ad1a..86aa8625 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CAlarmStatisticsPluginWidget.h"
 #include "CAlarmStatistics.h"
 
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.h
index 5876e1bd..c0c69466 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatisticsPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CALARMSTATISTICSPLUGINWIDGET_H
+#ifndef CALARMSTATISTICSPLUGINWIDGET_H
 #define CALARMSTATISTICSPLUGINWIDGET_H
 
 #include <QObject>
@@ -8,7 +8,7 @@
 class CAlarmStatisticsPluginWidget : public QWidget, 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/AlarmAnalyzeWidget/CCompareQueryThread.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp
index b0c46cae..7c9047d6 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp
@@ -1,4 +1,4 @@
-#include "CCompareQueryThread.h"
+#include "CCompareQueryThread.h"
 
 using namespace iot_public;
 using namespace iot_dbms;
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h
index e53b7898..044bee07 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h
@@ -1,4 +1,4 @@
-#ifndef CCOMPAREQUERYTHREAD_H
+#ifndef CCOMPAREQUERYTHREAD_H
 #define CCOMPAREQUERYTHREAD_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.cpp
index e4e61fd1..6e643127 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.cpp
@@ -1,4 +1,4 @@
-#include "CProcessDialog.h"
+#include "CProcessDialog.h"
 #include "ui_CProcessDialog.h"
 #include <QDebug>
 
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.h
index bb06cd74..d9cd15be 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CProcessDialog.h
@@ -1,4 +1,4 @@
-#ifndef CPROCESSDIALOG_H
+#ifndef CPROCESSDIALOG_H
 #define CPROCESSDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp
index 1de844d5..ea095b87 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp
@@ -1,4 +1,4 @@
-#include "CStatisticsQueryThread.h"
+#include "CStatisticsQueryThread.h"
 
 using namespace iot_public;
 using namespace iot_dbms;
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h
index ec65f259..8246f840 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h
@@ -1,4 +1,4 @@
-#ifndef CSTATISTICSQUERYTHREAD_H
+#ifndef CSTATISTICSQUERYTHREAD_H
 #define CSTATISTICSQUERYTHREAD_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.cpp
index 5360c04b..449a3746 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.cpp
@@ -1,4 +1,4 @@
-#include "CTableWidget.h"
+#include "CTableWidget.h"
 #include <QHeaderView>
 
 CTableWidget::CTableWidget(QWidget *parent)
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.h
index c0b48870..428b8c23 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CTableWidget.h
@@ -1,4 +1,4 @@
-#ifndef CTABLEWIDGET_H
+#ifndef CTABLEWIDGET_H
 #define CTABLEWIDGET_H
 
 #include <QTableWidget>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp
index 58bfe6b2..70cfcde6 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp
@@ -1,4 +1,4 @@
-#include <QProcess>
+#include <QProcess>
 #include "CWaveListDialog.h"
 #include "ui_CWaveListDialog.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.h
index d26a3627..ba4f0168 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.h
@@ -1,4 +1,4 @@
-#ifndef CWAVELISTDIALOG_H
+#ifndef CWAVELISTDIALOG_H
 #define CWAVELISTDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonDefine.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonDefine.h
index bb9a6f5c..a41f003d 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonDefine.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonDefine.h
@@ -1,4 +1,4 @@
-#ifndef COMMONDEFINE_H
+#ifndef COMMONDEFINE_H
 #define COMMONDEFINE_H
 
 #define CN_MAXBARSERIES         5                           // 最多柱状图组数
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.cpp
index 2e1d9513..3bfa8f15 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.cpp
@@ -1,4 +1,4 @@
-#include "CommonFunction.h"
+#include "CommonFunction.h"
 
 void resizeColumnsToContents(QTableView* pView , int scaleColumn)
 {
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.h
index 0acc53aa..a9144507 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CommonFunction.h
@@ -1,4 +1,4 @@
-#ifndef COMMONFUNCTION_H
+#ifndef COMMONFUNCTION_H
 #define COMMONFUNCTION_H
 
 #include <QTableView>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmInfo.h b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmInfo.h
index fbf73d73..321c2d07 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmInfo.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmInfo.h
@@ -1,4 +1,4 @@
-#ifndef SALARMINFO_H
+#ifndef SALARMINFO_H
 #define SALARMINFO_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmLevel.h b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmLevel.h
index e12de2b0..47b09591 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmLevel.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmLevel.h
@@ -1,4 +1,4 @@
-#ifndef SALARMLEVEL_H
+#ifndef SALARMLEVEL_H
 #define SALARMLEVEL_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmList.h b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmList.h
index becccbdc..9d8e6b60 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmList.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/SAlarmList.h
@@ -1,4 +1,4 @@
-#ifndef SALARMLIST_H
+#ifndef SALARMLIST_H
 #define SALARMLIST_H
 
 #include <QList>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/SDeviceGroup.h b/product/src/gui/plugin/AlarmAnalyzeWidget/SDeviceGroup.h
index 55020b40..ea4becf2 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/SDeviceGroup.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/SDeviceGroup.h
@@ -1,4 +1,4 @@
-#ifndef SDEVICEGROUP_H
+#ifndef SDEVICEGROUP_H
 #define SDEVICEGROUP_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/SLocation.h b/product/src/gui/plugin/AlarmAnalyzeWidget/SLocation.h
index 26a55659..8a1fb649 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/SLocation.h
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/SLocation.h
@@ -1,4 +1,4 @@
-#ifndef SLOCATION_H
+#ifndef SLOCATION_H
 #define SLOCATION_H
 
 #include <QList>
diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp
index 608529fb..a5acd0da 100644
--- a/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp
+++ b/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmStatistics.h"
+#include "CAlarmStatistics.h"
 #include <QApplication>
 #include <QFile>
 #include "pub_logger_api/logger.h"